From d92c731aa282b48fae1ffe4e47b3558b08c3e2cb Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Mon, 25 Jul 2022 10:19:07 +0200 Subject: [PATCH] Add Ubuntu 22.04 Jammy support. CI and docs updated - openstack-tox-py310 and Jammy tenks jobs. libzmq5 added as a dependency of vbmc/zmq Change-Id: Ibf0ca87bc86152953650e7ef8384e5c839d7a8bc --- ansible/roles/virtualbmc-daemon/vars/Debian.yml | 1 + doc/source/install.rst | 1 + zuul.d/jobs.yaml | 14 ++++++++++++-- zuul.d/project.yaml | 14 ++++++++++---- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ansible/roles/virtualbmc-daemon/vars/Debian.yml b/ansible/roles/virtualbmc-daemon/vars/Debian.yml index 17189af..bd97e98 100644 --- a/ansible/roles/virtualbmc-daemon/vars/Debian.yml +++ b/ansible/roles/virtualbmc-daemon/vars/Debian.yml @@ -4,3 +4,4 @@ vbmcd_packages: - gcc - libvirt-dev - pkg-config + - libzmq5 diff --git a/doc/source/install.rst b/doc/source/install.rst index e1c53c4..5bac8b9 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -34,6 +34,7 @@ Currently, Tenks supports the following OS distributions on the hypervisor: * CentOS Stream 8 * Debian Bullseye (11) * Ubuntu Focal 20.04 +* Ubuntu Jammy 22.04 To avoid conflicts with Python packages installed by the system package manager it is recommended to install Tenks in a virtualenv. Ensure that the diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 5d16cfe..18f1a8c 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -28,10 +28,15 @@ nodeset: debian-bullseye - job: - name: tenks-deploy-teardown-ovs-bios-ubuntu + name: tenks-deploy-teardown-ovs-bios-ubuntu-focal parent: tenks-deploy-teardown-ovs-bios-base nodeset: ubuntu-focal +- job: + name: tenks-deploy-teardown-ovs-bios-ubuntu-jammy + parent: tenks-deploy-teardown-ovs-bios-base + nodeset: ubuntu-jammy + - job: name: tenks-deploy-teardown-linuxbridge-uefi-centos8s parent: tenks-deploy-teardown-linuxbridge-uefi-base @@ -47,6 +52,11 @@ nodeset: debian-bullseye - job: - name: tenks-deploy-teardown-linuxbridge-uefi-ubuntu + name: tenks-deploy-teardown-linuxbridge-uefi-ubuntu-focal parent: tenks-deploy-teardown-linuxbridge-uefi-base nodeset: ubuntu-focal + +- job: + name: tenks-deploy-teardown-linuxbridge-uefi-ubuntu-jammy + parent: tenks-deploy-teardown-linuxbridge-uefi-base + nodeset: ubuntu-jammy diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 21170e9..f48ecac 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -11,13 +11,16 @@ - openstack-tox-py36 - openstack-tox-py38 - openstack-tox-py39 + - openstack-tox-py310 - tenks-tox-ansible-lint - tenks-deploy-teardown-ovs-bios-centos8s - tenks-deploy-teardown-ovs-bios-debian - - tenks-deploy-teardown-ovs-bios-ubuntu + - tenks-deploy-teardown-ovs-bios-ubuntu-focal + - tenks-deploy-teardown-ovs-bios-ubuntu-jammy - tenks-deploy-teardown-linuxbridge-uefi-centos8s - tenks-deploy-teardown-linuxbridge-uefi-debian - - tenks-deploy-teardown-linuxbridge-uefi-ubuntu + - tenks-deploy-teardown-linuxbridge-uefi-ubuntu-focal + - tenks-deploy-teardown-linuxbridge-uefi-ubuntu-jammy # Until we have ironic jobs using tenks, gate on the kayobe overcloud # deploy job, which uses tenks to test bare metal compute provisioning. - kayobe-overcloud-centos8s @@ -27,13 +30,16 @@ - openstack-tox-py36 - openstack-tox-py38 - openstack-tox-py39 + - openstack-tox-py310 - tenks-tox-ansible-lint - tenks-deploy-teardown-ovs-bios-centos8s - tenks-deploy-teardown-ovs-bios-debian - - tenks-deploy-teardown-ovs-bios-ubuntu + - tenks-deploy-teardown-ovs-bios-ubuntu-focal + - tenks-deploy-teardown-ovs-bios-ubuntu-jammy - tenks-deploy-teardown-linuxbridge-uefi-centos8s - tenks-deploy-teardown-linuxbridge-uefi-debian - - tenks-deploy-teardown-linuxbridge-uefi-ubuntu + - tenks-deploy-teardown-linuxbridge-uefi-ubuntu-focal + - tenks-deploy-teardown-linuxbridge-uefi-ubuntu-jammy # Until we have ironic jobs using tenks, gate on the kayobe overcloud # deploy job, which uses tenks to test bare metal compute provisioning. - kayobe-overcloud-centos8s