From 462664888756a7981db489125feda0315b3f9fc4 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Wed, 6 Jul 2022 11:49:21 +0200 Subject: [PATCH] Move bifrost tests to Ubuntu Jammy Leave ubuntu focal job defined for compatiblity with other projects and older versions. Change-Id: Idcfde886c9a92a5d09a07b1b8e88caa6a388f92a --- doc/source/install/index.rst | 3 +- .../tasks/prepare_libvirt.yml | 8 ++++ .../notes/jammy-3d6069b476fa02fc.yaml | 4 ++ zuul.d/bifrost-jobs.yaml | 44 +++++++++++++++---- zuul.d/project.yaml | 20 +++++---- 5 files changed, 61 insertions(+), 18 deletions(-) create mode 100644 releasenotes/notes/jammy-3d6069b476fa02fc.yaml diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index 3d7d5b96e..e3d30876d 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -19,12 +19,13 @@ Full support (fully tested in the CI, no known or potential issues): .. note:: RHEL 9 and derivatives are assumed to work but not tested explicitly. -* Ubuntu 20.04 "Focal" +* Ubuntu 22.04 "Jammy" * Debian 11 "Bullseye" Limited support, may be removed at any moment: * Fedora 34 (32+ is supported but not recommended) +* Ubuntu 20.04 "Focal" .. note:: Operating systems evolve and so does the support for them, even on stable diff --git a/playbooks/roles/bifrost-create-vm-nodes/tasks/prepare_libvirt.yml b/playbooks/roles/bifrost-create-vm-nodes/tasks/prepare_libvirt.yml index c4ca4971b..a1b86041f 100644 --- a/playbooks/roles/bifrost-create-vm-nodes/tasks/prepare_libvirt.yml +++ b/playbooks/roles/bifrost-create-vm-nodes/tasks/prepare_libvirt.yml @@ -176,6 +176,14 @@ state: absent when: ansible_os_family == 'RedHat' +- name: install virtualbmc dependencies + package: + name: libzmq5 + state: present + when: + - ansible_facts['distribution'] == "Ubuntu" + - ansible_facts['distribution_major_version']|int >= 22 + - name: install virtualbmc include_role: name: bifrost-pip-install diff --git a/releasenotes/notes/jammy-3d6069b476fa02fc.yaml b/releasenotes/notes/jammy-3d6069b476fa02fc.yaml new file mode 100644 index 000000000..780b5cc16 --- /dev/null +++ b/releasenotes/notes/jammy-3d6069b476fa02fc.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Ubuntu Jammy (22.04) is now supported as a base operating system. diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml index 48c631425..d7af2e381 100644 --- a/zuul.d/bifrost-jobs.yaml +++ b/zuul.d/bifrost-jobs.yaml @@ -40,9 +40,9 @@ noauth_mode: true - job: - name: bifrost-integration-dhcp-ubuntu-focal + name: bifrost-integration-dhcp-ubuntu-jammy parent: bifrost-integration-dhcp - nodeset: ubuntu-focal + nodeset: ubuntu-jammy - job: name: bifrost-integration-dhcp-centos-9 @@ -57,9 +57,9 @@ build_image: true - job: - name: bifrost-integration-dibipa-debian-ubuntu-focal + name: bifrost-integration-dibipa-debian-ubuntu-jammy parent: bifrost-integration-dibipa-debian - nodeset: ubuntu-focal + nodeset: ubuntu-jammy - job: name: bifrost-integration-dibipa-debian-centos-9 @@ -78,11 +78,25 @@ parent: bifrost-integration-tinyipa nodeset: ubuntu-bionic +# NOTE(rpittau): used by openstack/ironic, openstack/ansible-collections-openstack, +# openstack/ironic-inspector, openstack/openstacksdk - job: name: bifrost-integration-tinyipa-ubuntu-focal parent: bifrost-integration-tinyipa nodeset: ubuntu-focal +# NOTE(rpittau): used by openstack/ansible-collections-openstack +- job: + name: bifrost-integration-tinyipa-keystone-ubuntu-focal + parent: bifrost-integration-tinyipa + nodeset: ubuntu-focal + +- job: + name: bifrost-integration-tinyipa-ubuntu-jammy + parent: bifrost-integration-tinyipa + nodeset: ubuntu-jammy + +# NOTE(rpittau): remove after antelope - job: name: bifrost-integration-tinyipa-keystone-ubuntu-focal parent: bifrost-integration-tinyipa @@ -97,16 +111,29 @@ enable_prometheus_exporter: true - job: - name: bifrost-integration-redfish-vmedia-uefi-ubuntu-focal - parent: bifrost-integration-tinyipa-ubuntu-focal + name: bifrost-integration-tinyipa-keystone-ubuntu-jammy + parent: bifrost-integration-tinyipa + nodeset: ubuntu-jammy + required-projects: + - openstack/keystone + - openstack/ironic-prometheus-exporter + vars: + enable_keystone: true + enable_tls: true + test_driver: redfish + enable_prometheus_exporter: true + +- job: + name: bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy + parent: bifrost-integration-tinyipa-ubuntu-jammy vars: enable_tls: true test_driver: redfish use_vmedia: true - job: - name: bifrost-cli-ubuntu-focal - parent: bifrost-integration-tinyipa-ubuntu-focal + name: bifrost-cli-ubuntu-jammy + parent: bifrost-integration-tinyipa-ubuntu-jammy vars: cli_test: true @@ -166,6 +193,7 @@ skip_upgrade: - openstack/diskimage-builder +# NOTE(rpittau): convert to jammy after antelope - job: name: bifrost-upgrade-ubuntu-focal parent: bifrost-upgrade diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index b6d6cbe1c..84330c1bc 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -8,28 +8,30 @@ jobs: - bifrost-tox-linters - bifrost-integration-tinyipa-centos-9 - - bifrost-integration-tinyipa-ubuntu-focal - - bifrost-integration-tinyipa-keystone-ubuntu-focal + - bifrost-integration-tinyipa-ubuntu-jammy + - bifrost-integration-tinyipa-keystone-ubuntu-jammy - bifrost-integration-tinyipa-keystone-centos-9 - bifrost-integration-tinyipa-debian-bullseye - - bifrost-integration-redfish-vmedia-uefi-ubuntu-focal + - bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy - bifrost-integration-redfish-vmedia-uefi-centos-9 - bifrost-upgrade-ubuntu-focal - bifrost-upgrade-keystone-centos9 # Non-voting jobs + - bifrost-integration-tinyipa-keystone-ubuntu-focal: + voting: false - bifrost-integration-tinyipa-fedora-latest: voting: false - bifrost-integration-redfish-uefi-fedora-latest: voting: false - - bifrost-integration-dhcp-ubuntu-focal: + - bifrost-integration-dhcp-ubuntu-jammy: voting: false - bifrost-integration-dhcp-centos-9: voting: false - - bifrost-integration-dibipa-debian-ubuntu-focal: + - bifrost-integration-dibipa-debian-ubuntu-jammy: voting: false - bifrost-integration-dibipa-debian-centos-9: voting: false - - bifrost-cli-ubuntu-focal: + - bifrost-cli-ubuntu-jammy: voting: false - bifrost-collections-src: voting: false @@ -53,11 +55,11 @@ jobs: - bifrost-tox-linters - bifrost-integration-tinyipa-centos-9 - - bifrost-integration-tinyipa-ubuntu-focal - - bifrost-integration-tinyipa-keystone-ubuntu-focal + - bifrost-integration-tinyipa-ubuntu-jammy + - bifrost-integration-tinyipa-keystone-ubuntu-jammy - bifrost-integration-tinyipa-keystone-centos-9 - bifrost-integration-tinyipa-debian-bullseye - - bifrost-integration-redfish-vmedia-uefi-ubuntu-focal + - bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy - bifrost-integration-redfish-vmedia-uefi-centos-9 - bifrost-upgrade-ubuntu-focal - bifrost-upgrade-keystone-centos9