diff options
| -rw-r--r-- | .zuul.d/centos.yaml | 2 | ||||
| -rw-r--r-- | .zuul.d/debian.yaml | 12 | ||||
| -rw-r--r-- | .zuul.d/rocky.yaml | 8 | ||||
| -rw-r--r-- | .zuul.d/ubuntu.yaml | 30 |
4 files changed, 23 insertions, 29 deletions
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 57089f343..a20969f2e 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -3,7 +3,7 @@ check: jobs: - kolla-build-centos9s - - kolla-ansible-centos9s-source + - kolla-ansible-centos9s check-arm64: jobs: - kolla-build-centos9s-aarch64 diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml index b47b87557..67fa70ecd 100644 --- a/.zuul.d/debian.yaml +++ b/.zuul.d/debian.yaml @@ -3,17 +3,17 @@ check: jobs: - kolla-build-debian - - kolla-ansible-debian-source - - kolla-ansible-debian-source-upgrade + - kolla-ansible-debian + - kolla-ansible-debian-upgrade check-arm64: jobs: - kolla-build-debian-aarch64 - - kolla-ansible-debian-source-aarch64 + - kolla-ansible-debian-aarch64 gate: jobs: - kolla-build-debian - - kolla-ansible-debian-source - - kolla-ansible-debian-source-upgrade + - kolla-ansible-debian + - kolla-ansible-debian-upgrade periodic: jobs: - kolla-publish-debian-quay @@ -25,7 +25,7 @@ experimental: jobs: - kolla-build-no-infra-wheels-debian - - kolla-ansible-debian-source-ironic: + - kolla-ansible-debian-ironic: files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* - job: diff --git a/.zuul.d/rocky.yaml b/.zuul.d/rocky.yaml index 9d80512ad..93e955ee5 100644 --- a/.zuul.d/rocky.yaml +++ b/.zuul.d/rocky.yaml @@ -3,18 +3,14 @@ check: jobs: - kolla-build-rocky9 - - kolla-ansible-rocky9-source: - vars: - base_distro: "rocky" + - kolla-ansible-rocky9 check-arm64: jobs: - kolla-build-rocky9-aarch64 gate: jobs: - kolla-build-rocky9 - - kolla-ansible-rocky9-source: - vars: - base_distro: "rocky" + - kolla-ansible-rocky9 periodic: jobs: - kolla-publish-rocky9-quay diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index 66c5f8577..a92df5223 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -3,16 +3,16 @@ check: jobs: - kolla-build-ubuntu - - kolla-ansible-ubuntu-source - - kolla-ansible-ubuntu-source-upgrade + - kolla-ansible-ubuntu + - kolla-ansible-ubuntu-upgrade check-arm64: jobs: - kolla-build-ubuntu-aarch64 gate: jobs: - kolla-build-ubuntu - - kolla-ansible-ubuntu-source - - kolla-ansible-ubuntu-source-upgrade + - kolla-ansible-ubuntu + - kolla-ansible-ubuntu-upgrade periodic: jobs: - kolla-publish-ubuntu-quay @@ -23,27 +23,25 @@ jobs: - kolla-build-no-infra-wheels-ubuntu # Test rabbitmq and mariadb in multinode ceph jobs. - - kolla-ansible-ubuntu-source-cephadm: + - kolla-ansible-ubuntu-cephadm: files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - - kolla-ansible-ubuntu-source-upgrade-cephadm: + - kolla-ansible-ubuntu-upgrade-cephadm: files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - - kolla-ansible-ubuntu-source-zun: + - kolla-ansible-ubuntu-zun: files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* - - kolla-ansible-ubuntu-source-ironic: + - kolla-ansible-ubuntu-ironic: files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* - - kolla-ansible-ubuntu-source-swift: + - kolla-ansible-ubuntu-swift: files: ^docker/(base|openstack-base|glance|swift)/ - - kolla-ansible-ubuntu-source-mariadb: + - kolla-ansible-ubuntu-mariadb: files: ^docker/(base|mariadb)/ - - kolla-ansible-ubuntu-source-masakari: + - kolla-ansible-ubuntu-masakari: files: ^docker/(base|masakari|openstack-base)/ - - kolla-ansible-ubuntu-source-octavia: + - kolla-ansible-ubuntu-octavia: files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/ - - kolla-ansible-ubuntu-source-ovn: + - kolla-ansible-ubuntu-ovn: files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/ - - kolla-ansible-ubuntu-source-prometheus-efk: - files: ^docker/(base|elasticsearch|fluentd|grafana|kibana|prometheus)/ - - kolla-ansible-ubuntu-source-kvm: + - kolla-ansible-ubuntu-kvm: files: ^docker/nova/ - job: |