diff options
| author | Zuul <zuul@review.opendev.org> | 2023-10-20 11:47:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-10-20 11:47:00 +0000 |
| commit | ee4c225e57a9b68b224173d813ddf9bb5328663c (patch) | |
| tree | 5a1c296bf3c53ee7f33098f1701cb1311af50902 | |
| parent | 8498b43c1ec71ad7cea09123f91835d09f20b634 (diff) | |
| parent | d7425533c8b04d94b7feb3e3b90086cc7749b937 (diff) | |
| download | kolla-ee4c225e57a9b68b224173d813ddf9bb5328663c.tar.gz kolla-ee4c225e57a9b68b224173d813ddf9bb5328663c.zip | |
Merge "CI: Fix zuul config errors" into stable/zed
| -rw-r--r-- | .zuul.d/ubuntu.yaml | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index 5964fe4b0..0394d62a8 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -3,24 +3,16 @@ check: jobs: - kolla-build-ubuntu - - kolla-ansible-ubuntu-source: - vars: - kolla_python_version: "3.10" - - kolla-ansible-ubuntu-source-upgrade: - vars: - kolla_python_version: "3.10" + - kolla-ansible-ubuntu-source + - kolla-ansible-ubuntu-source-upgrade check-arm64: jobs: - kolla-build-ubuntu-aarch64 gate: jobs: - kolla-build-ubuntu - - kolla-ansible-ubuntu-source: - vars: - kolla_python_version: "3.10" - - kolla-ansible-ubuntu-source-upgrade: - vars: - kolla_python_version: "3.10" + - kolla-ansible-ubuntu-source + - kolla-ansible-ubuntu-source-upgrade periodic: jobs: - kolla-publish-ubuntu-quay @@ -33,48 +25,26 @@ # Test rabbitmq and mariadb in multinode ceph jobs. - kolla-ansible-ubuntu-source-cephadm: files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - vars: - kolla_python_version: "3.10" - kolla-ansible-ubuntu-source-upgrade-cephadm: files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - vars: - kolla_python_version: "3.10" - kolla-ansible-ubuntu-source-zun: files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* - vars: - kolla_python_version: "3.10" - kolla-ansible-ubuntu-source-ironic: files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* - vars: - kolla_python_version: "3.10" - kolla-ansible-ubuntu-source-swift: files: ^docker/(base|openstack-base|glance|swift)/ - vars: - kolla_python_version: "3.10" - kolla-ansible-ubuntu-source-mariadb: files: ^docker/(base|mariadb)/ - vars: - kolla_python_version: "3.10" - kolla-ansible-ubuntu-source-masakari: files: ^docker/(base|masakari|openstack-base)/ - vars: - kolla_python_version: "3.10" - kolla-ansible-ubuntu-source-octavia: files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/ - vars: - kolla_python_version: "3.10" - kolla-ansible-ubuntu-source-ovn: files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/ - vars: - kolla_python_version: "3.10" - - kolla-ansible-ubuntu-source-prometheus-efk: - files: ^docker/(base|elasticsearch|fluentd|grafana|kibana|prometheus)/ - vars: - kolla_python_version: "3.10" + - kolla-ansible-ubuntu-source-prometheus-opensearch: + files: ^docker/(base|fluentd|grafana|opensearch|opensearch-dashboards|prometheus)/ - kolla-ansible-ubuntu-source-kvm: files: ^docker/nova/ - vars: - kolla_python_version: "3.10" - job: name: kolla-build-ubuntu |