Merge pull request #266 from stackhpc/upstream/yoga-2023-10-02

Synchronise yoga with upstream
stackhpc · Oct 3, 2023 · cb708f1 · cb708f1
2 parents 4c19733 + c2be45c
commit cb708f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
@@ -8,7 +8,6 @@
         - kolla-ansible-centos8s-source
         - kolla-ansible-centos8s-binary
         - kolla-ansible-centos9s-source
-        - kolla-ansible-centos8s-source-upgrade
     check-arm64:
       jobs:
         - kolla-build-centos8s-source-aarch64
@@ -17,7 +16,6 @@
       jobs:
         - kolla-build-centos8s-source
         - kolla-ansible-centos8s-source
-        - kolla-ansible-centos8s-source-upgrade
     periodic:
       jobs:
         - kolla-publish-centos8s-source-quay
@@ -37,8 +35,6 @@
         # Test rabbitmq & mariadb changes in multinode ceph jobs.
         - kolla-ansible-centos8s-source-cephadm:
             files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-        - kolla-ansible-centos8s-source-upgrade-cephadm:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
         - kolla-ansible-centos8s-source-zun:
             files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
         - kolla-ansible-centos8s-source-scenario-nfv:

diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
@@ -5,7 +5,6 @@
         - kolla-build-debian-source
         - kolla-build-debian-binary
         - kolla-ansible-debian-source
-        - kolla-ansible-debian-source-upgrade
     check-arm64:
       jobs:
         - kolla-build-debian-source-aarch64
@@ -14,7 +13,6 @@
       jobs:
         - kolla-build-debian-source
         - kolla-ansible-debian-source
-        - kolla-ansible-debian-source-upgrade
     periodic:
       jobs:
         - kolla-publish-debian-source-quay

diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
@@ -5,16 +5,14 @@
         - kolla-build-ubuntu-binary
         - kolla-build-ubuntu-source
         - kolla-ansible-ubuntu-source
-        - kolla-ansible-ubuntu-binary
-        - kolla-ansible-ubuntu-source-upgrade
+        - kolla-ansible-ubuntu-binary-focal
     check-arm64:
       jobs:
         - kolla-build-ubuntu-source-aarch64
     gate:
       jobs:
         - kolla-build-ubuntu-source
         - kolla-ansible-ubuntu-source
-        - kolla-ansible-ubuntu-source-upgrade
     periodic:
       jobs:
         - kolla-publish-ubuntu-source-quay
@@ -29,8 +27,6 @@
         # Test rabbitmq and mariadb in multinode ceph jobs.
         - kolla-ansible-ubuntu-source-cephadm:
             files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-        - kolla-ansible-ubuntu-source-upgrade-cephadm:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
         - kolla-ansible-ubuntu-source-zun:
             files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
         - kolla-ansible-ubuntu-source-ironic:
@@ -41,13 +37,13 @@
             files: ^docker/(base|mariadb)/
         - kolla-ansible-ubuntu-source-masakari:
             files: ^docker/(base|masakari|openstack-base)/
-        - kolla-ansible-ubuntu-source-linuxbridge:
+        - kolla-ansible-ubuntu-source-linuxbridge-focal:
             files: ^docker/(base|neutron|openstack-base)/
         - kolla-ansible-ubuntu-source-octavia:
             files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/
         - kolla-ansible-ubuntu-source-ovn:
             files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
-        - kolla-ansible-ubuntu-source-prometheus-efk:
+        - kolla-ansible-ubuntu-source-prometheus-efk-focal:
             files: ^docker/(base|elasticsearch|fluentd|grafana|kibana|prometheus)/
         - kolla-ansible-ubuntu-source-kvm:
             files: ^docker/nova/