From 566d4ec5de3c6338adf7f99f672edad4e6afd5a0 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 27 Apr 2022 08:59:49 +0100 Subject: [PATCH] Add experimental Ubuntu 22.04 support This is not officially supported by openstack for the Yoga release due to 22.04 shipping python3.10, but the jobs are passing with only small adjustments so experimental support is added during the Yoga release. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-lxc_hosts/+/838836 Depends-On: https://review.opendev.org/c/openstack/ansible-role-uwsgi/+/838830 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-openstack_hosts/+/838832 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-galera_server/+/839521 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_horizon/+/840278 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_rally/+/840313 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-lxc_hosts/+/840518 Change-Id: Ieee9c0d690d4e8207a0806bd385ffccc12188906 --- playbooks/openstack-hosts-setup.yml | 4 +- .../tasks/check-requirements.yml | 4 +- zuul.d/jobs.yaml | 76 +++++++++++++++++++ zuul.d/playbooks/pre-gate-cleanup.yml | 2 +- zuul.d/project-templates.yaml | 16 ++++ 5 files changed, 99 insertions(+), 3 deletions(-) diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index 71863ae604..6e92ba15ad 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -55,11 +55,13 @@ that: - (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bullseye') or (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'focal') or + (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'jammy') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '9') msg: > The only supported platforms for this release are Debian 11 (Bullseye), - Ubuntu 20.04 LTS (Focal), CentOS 8 derivatives such as Rocky Linux, and CentOS 8 Stream. + Ubuntu 20.04 LTS (Focal), Ubuntu 22.04 (Yammy) CentOS 8 derivatives such + as Rocky Linux, CentOS 8 Stream and CentOS 9 Stream. roles: - role: "openstack_hosts" vars_files: diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml index c4a6f2b538..2caa5ef6e4 100644 --- a/tests/roles/bootstrap-host/tasks/check-requirements.yml +++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml @@ -18,11 +18,13 @@ that: (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bullseye') or (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'focal') or + (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'jammy') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '9') msg: >- The only supported platforms for this release are Debian 11 (Bullseye), - Ubuntu 20.04 LTS (Focal), CentOS 8 derivatives such as Rocky Linux, and CentOS 8 Stream. + Ubuntu 20.04 LTS (Focal), Ubuntu 22.04 (Yammy) CentOS 8 derivatives such + as Rocky Linux, CentOS 8 Stream and CentOS 9 Stream. when: (check_operating_system | default(True))| bool tags: - check-operating-system diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 40c58c102f..243399ff27 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -305,6 +305,82 @@ vars: ansible_package: "file://{{ ansible_user_dir }}/src/github.com/ansible/ansible" + +# ubuntu jammy +- job: + name: openstack-ansible-deploy-aio_lxc-ubuntu-jammy + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-jammy + +- job: + name: openstack-ansible-deploy-aio_ceph-ubuntu-jammy + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-jammy + +- job: + name: openstack-ansible-deploy-aio_nfs-ubuntu-jammy + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-jammy + +- job: + name: openstack-ansible-deploy-aio_proxy-ubuntu-jammy + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-jammy + +- job: + name: openstack-ansible-deploy-aio_metal-ubuntu-jammy + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-jammy + +- job: + name: openstack-ansible-upgrade-aio_metal-ubuntu-jammy + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-jammy + timeout: 10800 + +- job: + name: openstack-ansible-upgrade-aio_lxc-ubuntu-jammy + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-jammy + timeout: 10800 + +- job: + name: openstack-ansible-upgrade-infra_lxc-ubuntu-jammy + parent: openstack-ansible-deploy-aio-infra + nodeset: ubuntu-jammy + timeout: 10800 + +- job: + name: openstack-ansible-deploy-infra_lxc-ubuntu-jammy + parent: openstack-ansible-deploy-aio-infra + nodeset: ubuntu-jammy + +- job: + name: openstack-ansible-deploy-hosts_lxc-ubuntu-jammy + parent: openstack-ansible-deploy-aio-hosts + nodeset: ubuntu-jammy + +- job: + name: openstack-ansible-deploy-hosts_metal-ubuntu-jammy + parent: openstack-ansible-deploy-aio-hosts + nodeset: ubuntu-jammy + +- job: + name: openstack-ansible-deploy-aio_telemetry_metal-ubuntu-jammy + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-jammy + +- job: + name: openstack-ansible-deploy-aio_qdrouterd-ubuntu-jammy + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-jammy + +- job: + name: openstack-ansible-deploy-translations-ubuntu-jammy + parent: openstack-ansible-deploy-aio + nodeset: ubuntu-jammy + + # ubuntu focal - job: name: openstack-ansible-deploy-aio_lxc-ubuntu-focal diff --git a/zuul.d/playbooks/pre-gate-cleanup.yml b/zuul.d/playbooks/pre-gate-cleanup.yml index d6dcb4db73..3108a26789 100644 --- a/zuul.d/playbooks/pre-gate-cleanup.yml +++ b/zuul.d/playbooks/pre-gate-cleanup.yml @@ -28,7 +28,7 @@ regexp: 'https' replace: "http" when: - - ansible_facts['distribution_release'] in ['focal'] + - ansible_facts['distribution_release'] in ['focal', 'jammy'] - name: Remove package excludes for yum/dnf lineinfile: diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 8de9edd881..2bd1bd6c91 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -44,6 +44,8 @@ - openstack-ansible-deploy-aio_lxc-debian-bullseye - openstack-ansible-deploy-aio_lxc-rockylinux-8 - openstack-ansible-deploy-aio_lxc-ubuntu-focal + - openstack-ansible-deploy-aio_lxc-ubuntu-jammy: + voting: false gate: jobs: - openstack-ansible-deploy-aio_lxc-centos-8-stream @@ -87,6 +89,8 @@ - openstack-ansible-deploy-infra_lxc-debian-bullseye - openstack-ansible-deploy-infra_lxc-rockylinux-8 - openstack-ansible-deploy-infra_lxc-ubuntu-focal + - openstack-ansible-deploy-infra_lxc-ubuntu-jammy: + voting: false gate: jobs: - openstack-ansible-deploy-infra_lxc-centos-8-stream @@ -107,6 +111,8 @@ - openstack-ansible-deploy-hosts_lxc-debian-bullseye - openstack-ansible-deploy-hosts_lxc-rockylinux-8 - openstack-ansible-deploy-hosts_lxc-ubuntu-focal + - openstack-ansible-deploy-hosts_lxc-ubuntu-jammy: + voting: false gate: jobs: - openstack-ansible-deploy-hosts_lxc-centos-8-stream @@ -127,6 +133,8 @@ - openstack-ansible-deploy-hosts_metal-debian-bullseye - openstack-ansible-deploy-hosts_metal-rockylinux-8 - openstack-ansible-deploy-hosts_metal-ubuntu-focal + - openstack-ansible-deploy-hosts_metal-ubuntu-jammy: + voting: false gate: jobs: - openstack-ansible-deploy-hosts_metal-centos-8-stream @@ -168,6 +176,8 @@ - openstack-ansible-deploy-aio_metal-centos-8-stream - openstack-ansible-deploy-aio_metal-centos-9-stream - openstack-ansible-deploy-aio_metal-ubuntu-focal + - openstack-ansible-deploy-aio_metal-ubuntu-jammy: + voting: false - openstack-ansible-deploy-aio_metal-rockylinux-8 - openstack-ansible-upgrade-aio_metal-centos-8-stream: voting: false @@ -189,6 +199,8 @@ - openstack-ansible-deploy-aio_telemetry_metal-debian-bullseye - openstack-ansible-deploy-aio_telemetry_metal-rockylinux-8 - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-focal + - openstack-ansible-deploy-aio_telemetry_metal-ubuntu-jammy: + voting: false gate: jobs: - openstack-ansible-deploy-aio_telemetry_metal-centos-8-stream @@ -215,6 +227,8 @@ check: jobs: - openstack-ansible-deploy-aio_nfs-ubuntu-focal + - openstack-ansible-deploy-aio_nfs-ubuntu-jammy: + voting: false gate: jobs: - openstack-ansible-deploy-aio_nfs-ubuntu-focal @@ -224,6 +238,8 @@ check: jobs: - openstack-ansible-deploy-aio_ceph-ubuntu-focal + - openstack-ansible-deploy-aio_ceph-ubuntu-jammy: + voting: false gate: jobs: - openstack-ansible-deploy-aio_ceph-ubuntu-focal