6 files changed, 30 insertions, 65 deletions
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 5dc830c38..e071fd589 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -23,7 +23,9 @@
       - ^LICENSE$
       - ^tox\.ini$
     vars:
-      base_arch: "x86_64"
+      base_arch: "{{ 'aarch64' if 'arm64' in zuul.job else 'x86_64' }}"
+      base_distro: "{{ zuul.job.split('-').2 }}"
+      base_distro_version: "{{ zuul.job.split('-').3 }}"
       publisher: false
       container_engine: "docker"
     extra-vars:
diff --git a/zuul.d/centos.yaml b/zuul.d/centos.yaml
index e90ea4fa6..3c48f9e0c 100644
--- a/zuul.d/centos.yaml
+++ b/zuul.d/centos.yaml
@@ -3,24 +3,18 @@
     name: kolla-build-centos-10s
     parent: kolla-base
     nodeset: kolla-centos-10s-8GB
-    vars:
-      base_distro: centos
     voting: false
 
 - job:
-    name: kolla-build-centos-10s-aarch64
+    name: kolla-build-centos-10s-arm64
     parent: kolla-build-centos-10s
-    nodeset: kolla-centos-10s-aarch64-8GB
-    vars:
-      base_arch: aarch64
+    nodeset: kolla-centos-10s-arm64-8GB
     voting: false
 
 - job:
-    name: kolla-build-no-infra-wheels-centos-10s
+    name: kolla-build-centos-10s-no-infra-wheels
     parent: kolla-build-no-infra-wheels-base
     nodeset: kolla-centos-10s-8GB
-    vars:
-      base_distro: centos
 
 - project-template:
     name: kolla-build-centos
@@ -31,7 +25,7 @@
         - kolla-build-centos-10s
     check-arm64:
       jobs:
-        - kolla-build-centos-10s-aarch64
+        - kolla-build-centos-10s-arm64
     experimental:
       jobs:
-        - kolla-build-no-infra-wheels-centos-10s
+        - kolla-build-centos-10s-no-infra-wheels
diff --git a/zuul.d/debian.yaml b/zuul.d/debian.yaml
index 931d169b6..66b0badac 100644
--- a/zuul.d/debian.yaml
+++ b/zuul.d/debian.yaml
@@ -3,25 +3,17 @@
     name: kolla-build-debian-bookworm
     parent: kolla-base
     nodeset: kolla-debian-bookworm-8GB
-    vars:
-      base_distro: debian
-      base_distro_version: bookworm
 
 - job:
     name: kolla-build-debian-bookworm-podman
     parent: kolla-base-podman
     nodeset: kolla-debian-bookworm-8GB
-    vars:
-      base_distro: debian
-      base_distro_version: bookworm
 
 - job:
-    name: kolla-build-debian-bookworm-aarch64
+    name: kolla-build-debian-bookworm-arm64
     parent: kolla-build-debian-bookworm
-    nodeset: kolla-debian-bookworm-aarch64-8GB
+    nodeset: kolla-debian-bookworm-arm64-8GB
     voting: false
-    vars:
-      base_arch: aarch64
 
 - job:
     name: kolla-publish-debian-bookworm-quay
@@ -36,8 +28,8 @@
       - kolla_quay_io_api
 
 - job:
-    name: kolla-publish-debian-bookworm-aarch64-quay
-    parent: kolla-build-debian-bookworm-aarch64
+    name: kolla-publish-debian-bookworm-arm64-quay
+    parent: kolla-build-debian-bookworm-arm64
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
@@ -48,11 +40,9 @@
       - kolla_quay_io_api
 
 - job:
-    name: kolla-build-no-infra-wheels-debian-bookworm
+    name: kolla-build-debian-bookworm-no-infra-wheels
     parent: kolla-build-no-infra-wheels-base
     nodeset: kolla-debian-bookworm-8GB
-    vars:
-      base_distro: debian
 
 - project-template:
     name: kolla-build-debian
@@ -64,15 +54,15 @@
         - kolla-build-debian-bookworm-podman
     check-arm64:
       jobs:
-        - kolla-build-debian-bookworm-aarch64
+        - kolla-build-debian-bookworm-arm64
     gate:
       jobs:
         - kolla-build-debian-bookworm
         - kolla-build-debian-bookworm-podman
     experimental:
       jobs:
-        - kolla-build-no-infra-wheels-debian-bookworm
+        - kolla-build-debian-bookworm-no-infra-wheels
     periodic:
       jobs:
         - kolla-publish-debian-bookworm-quay
-        - kolla-publish-debian-bookworm-aarch64-quay
+        - kolla-publish-debian-bookworm-arm64-quay
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index bdb9fc8c8..5a069beb6 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -6,7 +6,7 @@
         label: centos-10-stream-8GB
 
 - nodeset:
-    name: kolla-centos-10s-aarch64-8GB
+    name: kolla-centos-10s-arm64-8GB
     nodes:
       - name: primary
         label: centos-10-stream-arm64-8GB
@@ -18,7 +18,7 @@
         label: debian-bookworm-8GB
 
 - nodeset:
-    name: kolla-debian-bookworm-aarch64-8GB
+    name: kolla-debian-bookworm-arm64-8GB
     nodes:
       - name: primary
         label: debian-bookworm-arm64-8GB
@@ -30,7 +30,7 @@
         label: rockylinux-10-8GB
 
 - nodeset:
-    name: kolla-rocky-10-aarch64-8GB
+    name: kolla-rocky-10-arm64-8GB
     nodes:
       - name: primary
         label: rockylinux-10-arm64-8GB
@@ -42,7 +42,7 @@
         label: ubuntu-noble-8GB
 
 - nodeset:
-    name: kolla-ubuntu-noble-aarch64-8GB
+    name: kolla-ubuntu-noble-arm64-8GB
     nodes:
       - name: primary
         label: ubuntu-noble-arm64-8GB
diff --git a/zuul.d/rocky.yaml b/zuul.d/rocky.yaml
index 443c98f87..f854cca6e 100644
--- a/zuul.d/rocky.yaml
+++ b/zuul.d/rocky.yaml
@@ -3,33 +3,22 @@
     name: kolla-build-rocky-10
     parent: kolla-base
     nodeset: kolla-rocky-10-8GB
-    vars:
-      base_distro: rocky
-      base_distro_version: 10
 
 - job:
     name: kolla-build-rocky-10-podman
     parent: kolla-base-podman
     nodeset: kolla-rocky-10-8GB
-    vars:
-      base_distro: rocky
-      base_distro_version: 10
 
 - job:
-    name: kolla-build-rocky-10-aarch64
+    name: kolla-build-rocky-10-arm64
     parent: kolla-build-rocky-10
-    nodeset: kolla-rocky-10-aarch64-8GB
-    vars:
-      base_arch: aarch64
+    nodeset: kolla-rocky-10-arm64-8GB
     voting: false
 
 - job:
-    name: kolla-build-no-infra-wheels-rocky-10
+    name: kolla-build-rocky-10-no-infra-wheels
     parent: kolla-build-no-infra-wheels-base
     nodeset: kolla-rocky-10-8GB
-    vars:
-      base_distro: rocky
-      base_distro_version: 10
 
 - job:
     name: kolla-publish-rocky-10-quay
@@ -53,10 +42,10 @@
         - kolla-build-rocky-10-podman
     check-arm64:
       jobs:
-        - kolla-build-rocky-10-aarch64
+        - kolla-build-rocky-10-arm64
     experimental:
       jobs:
-        - kolla-build-no-infra-wheels-rocky-10
+        - kolla-build-rocky-10-no-infra-wheels
     gate:
       jobs:
         - kolla-build-rocky-10
diff --git a/zuul.d/ubuntu.yaml b/zuul.d/ubuntu.yaml
index d10bfd8d0..258b98f6c 100644
--- a/zuul.d/ubuntu.yaml
+++ b/zuul.d/ubuntu.yaml
@@ -3,24 +3,16 @@
     name: kolla-build-ubuntu-noble
     parent: kolla-base
     nodeset: kolla-ubuntu-noble-8GB
-    vars:
-      base_distro: ubuntu
-      base_distro_version: noble
 
 - job:
     name: kolla-build-ubuntu-noble-podman
     parent: kolla-base-podman
     nodeset: kolla-ubuntu-noble-8GB
-    vars:
-      base_distro: ubuntu
-      base_distro_version: noble
 
 - job:
-    name: kolla-build-ubuntu-noble-aarch64
+    name: kolla-build-ubuntu-noble-arm64
     parent: kolla-build-ubuntu-noble
-    nodeset: kolla-ubuntu-noble-aarch64-8GB
-    vars:
-      base_arch: aarch64
+    nodeset: kolla-ubuntu-noble-arm64-8GB
     voting: false
 
 - job:
@@ -36,11 +28,9 @@
       - kolla_quay_io_api
 
 - job:
-    name: kolla-build-no-infra-wheels-ubuntu-noble
+    name: kolla-build-ubuntu-noble-no-infra-wheels
     parent: kolla-build-no-infra-wheels-base
     nodeset: kolla-ubuntu-noble-8GB
-    vars:
-      base_distro: ubuntu
 
 - project-template:
     name: kolla-build-ubuntu
@@ -52,14 +42,14 @@
         - kolla-build-ubuntu-noble-podman
     check-arm64:
       jobs:
-        - kolla-build-ubuntu-noble-aarch64
+        - kolla-build-ubuntu-noble-arm64
     gate:
       jobs:
         - kolla-build-ubuntu-noble
         - kolla-build-ubuntu-noble-podman
     experimental:
       jobs:
-        - kolla-build-no-infra-wheels-ubuntu-noble
+        - kolla-build-ubuntu-noble-no-infra-wheels
     periodic:
       jobs:
         - kolla-publish-ubuntu-noble-quay