From c2be45ca14f1ddeed47be35179c7e1f5c7fce358 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 2 Oct 2023 07:40:35 +0200 Subject: [PATCH] CI: Drop upgrade jobs since Xena is EOL Following Ic24969c2fd2e886568fb66c67553c530ca005fe2 Renamed some jobs to reflect current state of kolla-ansible@stable/yoga repo. Change-Id: Idd3eee7a3d25a795d3b3565f26e5c7190487da6a --- .zuul.d/centos.yaml | 4 ---- .zuul.d/debian.yaml | 2 -- .zuul.d/ubuntu.yaml | 10 +++------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 83662ff198..97ca1802b4 100644 --- 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 index fce420e801..266bcdc83a 100644 --- 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 index 4e15ba740a..d1c32114c4 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -5,8 +5,7 @@ - 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 @@ -14,7 +13,6 @@ 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/