fix node pinning, new lorax path

This commit is contained in:
Neil Hanlon 2024-05-04 15:26:32 -04:00
parent 7811415112
commit 439f1f7984
Signed by untrusted user: neil
GPG Key ID: 705BC21EC3C70F34
2 changed files with 5 additions and 1 deletions

View File

@ -16,6 +16,7 @@ parser.add_argument('--rc', action='store_true', help="Release Candidate, Beta,
results = parser.parse_args() results = parser.parse_args()
rlvars = rldict[results.release] rlvars = rldict[results.release]
major = rlvars['major'] major = rlvars['major']
minor = rlvars['minor']
EXTARCH=["s390x", "ppc64le"] EXTARCH=["s390x", "ppc64le"]
EKSARCH=["amd64", "arm64"] EKSARCH=["amd64", "arm64"]
@ -42,7 +43,7 @@ def run():
out = "" out = ""
for architecture in arches: for architecture in arches:
copy_command = (f"aws s3 cp --recursive --exclude=* --include=lorax* " copy_command = (f"aws s3 cp --recursive --exclude=* --include=lorax* "
f"/var/lib/mock/rocky-{ major }-$(uname -m)/root/builddir/ " f"/var/lib/mock/rocky-{ major }.{ minor }-$(uname -m)/root/builddir/ "
f"s3://resf-empanadas/buildiso-{ major }-{ architecture }/{ buildstamp.strftime('%s') }/" f"s3://resf-empanadas/buildiso-{ major }-{ architecture }/{ buildstamp.strftime('%s') }/"
) )
out += job_template.render( out += job_template.render(
@ -54,6 +55,7 @@ def run():
jobname="buildiso", jobname="buildiso",
namespace="empanadas", namespace="empanadas",
major=major, major=major,
minor=minor,
restartPolicy="Never", restartPolicy="Never",
) )

View File

@ -53,6 +53,8 @@ spec:
key: peridot.rockylinux.org/workflow-tolerates-arch key: peridot.rockylinux.org/workflow-tolerates-arch
operator: Equal operator: Equal
value: {{ architecture }} value: {{ architecture }}
nodeSelector:
kubernetes.io/arch: {{ architecture }}
restartPolicy: {{ restartPolicy }} restartPolicy: {{ restartPolicy }}
volumes: volumes:
- name: resolv-conf - name: resolv-conf