From 439f1f79840a9fa2466abc3328cf79def04d69ad Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@rockylinux.org>
Date: Sat, 4 May 2024 15:26:32 -0400
Subject: [PATCH] fix node pinning, new lorax path

---
 iso/empanadas/empanadas/scripts/launch_builds.py | 4 +++-
 iso/empanadas/empanadas/templates/kube/Job.tmpl  | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/iso/empanadas/empanadas/scripts/launch_builds.py b/iso/empanadas/empanadas/scripts/launch_builds.py
index 2267466..96e4e46 100755
--- a/iso/empanadas/empanadas/scripts/launch_builds.py
+++ b/iso/empanadas/empanadas/scripts/launch_builds.py
@@ -16,6 +16,7 @@ parser.add_argument('--rc', action='store_true', help="Release Candidate, Beta,
 results = parser.parse_args()
 rlvars = rldict[results.release]
 major = rlvars['major']
+minor = rlvars['minor']
 
 EXTARCH=["s390x", "ppc64le"]
 EKSARCH=["amd64", "arm64"]
@@ -42,7 +43,7 @@ def run():
     out = ""
     for architecture in arches:
         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') }/"
         )
         out += job_template.render(
@@ -54,6 +55,7 @@ def run():
             jobname="buildiso",
             namespace="empanadas",
             major=major,
+            minor=minor,
             restartPolicy="Never",
         )
 
diff --git a/iso/empanadas/empanadas/templates/kube/Job.tmpl b/iso/empanadas/empanadas/templates/kube/Job.tmpl
index e9a32a9..9dff67f 100644
--- a/iso/empanadas/empanadas/templates/kube/Job.tmpl
+++ b/iso/empanadas/empanadas/templates/kube/Job.tmpl
@@ -53,6 +53,8 @@ spec:
         key: peridot.rockylinux.org/workflow-tolerates-arch
         operator: Equal
         value: {{ architecture }}
+      nodeSelector:
+        kubernetes.io/arch: {{ architecture }}
       restartPolicy: {{ restartPolicy }}
       volumes:
       - name: resolv-conf