Merge "CI: drop 'source' from build job names"

3 files changed, 48 insertions, 48 deletions

diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
index e37e7ab51..cf4779198 100644
--- a/.zuul.d/centos.yaml
+++ b/.zuul.d/centos.yaml
@@ -2,27 +2,27 @@
 - project:
     check:
       jobs:
-        - kolla-build-centos8s-source
+        - kolla-build-centos8s
         - kolla-ansible-centos8s-source
         - kolla-ansible-centos8s-source-upgrade
     check-arm64:
       jobs:
-        - kolla-build-centos8s-source-aarch64
+        - kolla-build-centos8s-aarch64
     gate:
       queue: kolla
       jobs:
-        - kolla-build-centos8s-source
+        - kolla-build-centos8s
         - kolla-ansible-centos8s-source
         - kolla-ansible-centos8s-source-upgrade
     periodic:
       jobs:
-        - kolla-publish-centos8s-source-quay
+        - kolla-publish-centos8s-quay
     periodic-weekly:
       jobs:
-        - kolla-publish-centos8s-source-dockerhub
+        - kolla-publish-centos8s-dockerhub
     experimental:
       jobs:
-        - kolla-build-no-infra-wheels-centos8s-source
+        - kolla-build-no-infra-wheels-centos8s
         - kolla-ansible-centos8s-source-bifrost:
             files: ^docker\/(base|bifrost|openstack-base)\/.*
         # Test rabbitmq & mariadb changes in multinode ceph jobs.
@@ -52,7 +52,7 @@
             files: ^docker/nova/
 
 - job:
-    name: kolla-build-centos8s-source
+    name: kolla-build-centos8s
     parent: kolla-base
     nodeset: kolla-centos8-stream
     vars:
@@ -60,14 +60,14 @@
       install_type: source
 
 - job:
-    name: kolla-build-centos8s-source-aarch64
-    parent: kolla-build-centos8s-source
+    name: kolla-build-centos8s-aarch64
+    parent: kolla-build-centos8s
     nodeset: kolla-centos8-stream-aarch64
     voting: false
 
 - job:
-    name: kolla-publish-centos8s-source-dockerhub
-    parent: kolla-build-centos8s-source
+    name: kolla-publish-centos8s-dockerhub
+    parent: kolla-build-centos8s
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
@@ -77,8 +77,8 @@
       - kolla_dockerhub_creds
 
 - job:
-    name: kolla-publish-centos8s-source-quay
-    parent: kolla-build-centos8s-source
+    name: kolla-publish-centos8s-quay
+    parent: kolla-build-centos8s
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
@@ -88,7 +88,7 @@
       - kolla_quay_io_creds
 
 - job:
-    name: kolla-build-no-infra-wheels-centos8s-source
+    name: kolla-build-no-infra-wheels-centos8s
     parent: kolla-build-no-infra-wheels-base
     nodeset: kolla-centos8-stream
     vars:
diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
index 01bd68d73..7903bcc3d 100644
--- a/.zuul.d/debian.yaml
+++ b/.zuul.d/debian.yaml
@@ -2,35 +2,35 @@
 - project:
     check:
       jobs:
-        - kolla-build-debian-source
+        - kolla-build-debian
         - kolla-ansible-debian-source
         - kolla-ansible-debian-source-upgrade
     check-arm64:
       jobs:
-        - kolla-build-debian-source-aarch64
+        - kolla-build-debian-aarch64
         - kolla-ansible-debian-source-aarch64
     gate:
       queue: kolla
       jobs:
-        - kolla-build-debian-source
+        - kolla-build-debian
         - kolla-ansible-debian-source
         - kolla-ansible-debian-source-upgrade
     periodic:
       jobs:
-        - kolla-publish-debian-source-quay
-        - kolla-publish-debian-source-aarch64-quay
+        - kolla-publish-debian-quay
+        - kolla-publish-debian-aarch64-quay
     periodic-weekly:
       jobs:
-        - kolla-publish-debian-source-dockerhub
-        - kolla-publish-debian-source-aarch64-dockerhub
+        - kolla-publish-debian-dockerhub
+        - kolla-publish-debian-aarch64-dockerhub
     experimental:
       jobs:
-        - kolla-build-no-infra-wheels-debian-source
+        - kolla-build-no-infra-wheels-debian
         - kolla-ansible-debian-source-ironic:
             files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
 
 - job:
-    name: kolla-build-debian-source
+    name: kolla-build-debian
     parent: kolla-base
     nodeset: kolla-debian-bullseye
     vars:
@@ -38,13 +38,13 @@
       install_type: source
 
 - job:
-    name: kolla-build-debian-source-aarch64
-    parent: kolla-build-debian-source
+    name: kolla-build-debian-aarch64
+    parent: kolla-build-debian
     nodeset: kolla-debian-bullseye-aarch64
 
 - job:
-    name: kolla-publish-debian-source-dockerhub
-    parent: kolla-build-debian-source
+    name: kolla-publish-debian-dockerhub
+    parent: kolla-build-debian
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
@@ -54,8 +54,8 @@
       - kolla_dockerhub_creds
 
 - job:
-    name: kolla-publish-debian-source-quay
-    parent: kolla-build-debian-source
+    name: kolla-publish-debian-quay
+    parent: kolla-build-debian
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
@@ -65,8 +65,8 @@
       - kolla_quay_io_creds
 
 - job:
-    name: kolla-publish-debian-source-aarch64-dockerhub
-    parent: kolla-build-debian-source-aarch64
+    name: kolla-publish-debian-aarch64-dockerhub
+    parent: kolla-build-debian-aarch64
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
@@ -76,8 +76,8 @@
       - kolla_dockerhub_creds
 
 - job:
-    name: kolla-publish-debian-source-aarch64-quay
-    parent: kolla-build-debian-source-aarch64
+    name: kolla-publish-debian-aarch64-quay
+    parent: kolla-build-debian-aarch64
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
@@ -87,7 +87,7 @@
       - kolla_quay_io_creds
 
 - job:
-    name: kolla-build-no-infra-wheels-debian-source
+    name: kolla-build-no-infra-wheels-debian
     parent: kolla-build-no-infra-wheels-base
     nodeset: kolla-debian-bullseye
     vars:
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
index 22730c8e8..20dc92e7d 100644
--- a/.zuul.d/ubuntu.yaml
+++ b/.zuul.d/ubuntu.yaml
@@ -2,27 +2,27 @@
 - project:
     check:
       jobs:
-        - kolla-build-ubuntu-source
+        - kolla-build-ubuntu
         - kolla-ansible-ubuntu-source
         - kolla-ansible-ubuntu-source-upgrade
     check-arm64:
       jobs:
-        - kolla-build-ubuntu-source-aarch64
+        - kolla-build-ubuntu-aarch64
     gate:
       queue: kolla
       jobs:
-        - kolla-build-ubuntu-source
+        - kolla-build-ubuntu
         - kolla-ansible-ubuntu-source
         - kolla-ansible-ubuntu-source-upgrade
     periodic:
       jobs:
-        - kolla-publish-ubuntu-source-quay
+        - kolla-publish-ubuntu-quay
     periodic-weekly:
       jobs:
-        - kolla-publish-ubuntu-source-dockerhub
+        - kolla-publish-ubuntu-dockerhub
     experimental:
       jobs:
-        - kolla-build-no-infra-wheels-ubuntu-source
+        - kolla-build-no-infra-wheels-ubuntu
         # Test rabbitmq and mariadb in multinode ceph jobs.
         - kolla-ansible-ubuntu-source-cephadm:
             files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
@@ -50,7 +50,7 @@
             files: ^docker/nova/
 
 - job:
-    name: kolla-build-ubuntu-source
+    name: kolla-build-ubuntu
     parent: kolla-base
     nodeset: kolla-ubuntu-focal
     vars:
@@ -58,14 +58,14 @@
       install_type: source
 
 - job:
-    name: kolla-build-ubuntu-source-aarch64
-    parent: kolla-build-ubuntu-source
+    name: kolla-build-ubuntu-aarch64
+    parent: kolla-build-ubuntu
     nodeset: kolla-ubuntu-focal-aarch64
     voting: false
 
 - job:
-    name: kolla-publish-ubuntu-source-dockerhub
-    parent: kolla-build-ubuntu-source
+    name: kolla-publish-ubuntu-dockerhub
+    parent: kolla-build-ubuntu
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
@@ -75,8 +75,8 @@
       - kolla_dockerhub_creds
 
 - job:
-    name: kolla-publish-ubuntu-source-quay
-    parent: kolla-build-ubuntu-source
+    name: kolla-publish-ubuntu-quay
+    parent: kolla-build-ubuntu
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
@@ -86,7 +86,7 @@
       - kolla_quay_io_creds
 
 - job:
-    name: kolla-build-no-infra-wheels-ubuntu-source
+    name: kolla-build-no-infra-wheels-ubuntu
     parent: kolla-build-no-infra-wheels-base
     nodeset: kolla-ubuntu-focal
     vars: