diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2022-04-27 15:47:41 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-07-27 11:27:01 +0200 |
| commit | 9f25aac18a31920c2f2f6630b35f3f734f03dcf4 (patch) | |
| tree | a837f3fcb359a5f0f0726d15d8ad1d777e56262a /.zuul.d | |
| parent | dc55bdb5eee7c41660c7ef7a5bd5064d95f003f4 (diff) | |
| download | kolla-9f25aac18a31920c2f2f6630b35f3f734f03dcf4.tar.gz kolla-9f25aac18a31920c2f2f6630b35f3f734f03dcf4.zip | |
Move to Ubuntu Jammy (22.04)
mariadb - downloads.mariadb.com doesn't have jammy version, should
be there soon - using Ubuntu provided version for now
telegraf/collectd - collectd packages missing in Jammy - marked
as unbuildable
monasca - requires new librdkafka, no wheel for Python 3.10 for now
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/846070
Change-Id: I11b4fbcaba165824252902d0270ce1dbbc3d6e9d
Diffstat (limited to '.zuul.d')
| -rw-r--r-- | .zuul.d/base.yaml | 8 | ||||
| -rw-r--r-- | .zuul.d/ubuntu.yaml | 46 |
2 files changed, 43 insertions, 11 deletions
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index 940953977..d16c76df1 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -61,10 +61,10 @@ label: centos-8-stream - nodeset: - name: kolla-ubuntu-focal + name: kolla-ubuntu-jammy nodes: - name: primary - label: ubuntu-focal + label: ubuntu-jammy - nodeset: name: kolla-debian-bullseye @@ -85,10 +85,10 @@ label: debian-bullseye-arm64 - nodeset: - name: kolla-ubuntu-focal-aarch64 + name: kolla-ubuntu-jammy-aarch64 nodes: - name: primary - label: ubuntu-focal-arm64 + label: ubuntu-jammy-arm64 - job: name: kolla-base diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index 8d9f1f77a..ab2055da0 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -3,16 +3,24 @@ check: jobs: - kolla-build-ubuntu - - kolla-ansible-ubuntu-source - - kolla-ansible-ubuntu-source-upgrade + - kolla-ansible-ubuntu-source: + vars: + kolla_python_version: "3.10" + - kolla-ansible-ubuntu-source-upgrade: + vars: + kolla_python_version: "3.10" check-arm64: jobs: - kolla-build-ubuntu-aarch64 gate: jobs: - kolla-build-ubuntu - - kolla-ansible-ubuntu-source - - kolla-ansible-ubuntu-source-upgrade + - kolla-ansible-ubuntu-source: + vars: + kolla_python_version: "3.10" + - kolla-ansible-ubuntu-source-upgrade: + vars: + kolla_python_version: "3.10" periodic: jobs: - kolla-publish-ubuntu-quay @@ -25,33 +33,57 @@ # 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-linuxbridge: files: ^docker/(base|neutron|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-kvm: files: ^docker/nova/ + vars: + kolla_python_version: "3.10" - job: name: kolla-build-ubuntu parent: kolla-base - nodeset: kolla-ubuntu-focal + nodeset: kolla-ubuntu-jammy vars: base_distro: ubuntu base_distro_version: focal @@ -59,7 +91,7 @@ - job: name: kolla-build-ubuntu-aarch64 parent: kolla-build-ubuntu - nodeset: kolla-ubuntu-focal-aarch64 + nodeset: kolla-ubuntu-jammy-aarch64 voting: false - job: @@ -87,6 +119,6 @@ - job: name: kolla-build-no-infra-wheels-ubuntu parent: kolla-build-no-infra-wheels-base - nodeset: kolla-ubuntu-focal + nodeset: kolla-ubuntu-jammy vars: base_distro: ubuntu |