From e10a964110498c7b74f05f946eb99887a2229069 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Wed, 10 May 2023 18:00:47 +0200 Subject: [PATCH] Pin Sphinx version and update Ubuntu Focal nodes to Jammy Unfortunately this patch has to include two unrelated changes, otherwise jobs fail and separate patches could not be merged. Sphinx version needs to be pinned to 4.4.0 (or earlier), because new version 7.0.0 causes some issues. Due to recent changes in devstack-plugin-ceph, the devstack-tobiko-storage-ceph job failed with ubuntu focal nodes, so its nodeset has to be modified to use jammy instead. This patch also updates to ubuntu jammy other jobs that pass with those nodes. However, some other tobiko jobs need to keep on using ubuntu focal: more specifically, those jobs running scenario tests on Ubuntu VM instances fail with jammy nodes. Change-Id: I955beb104db24377a697b1bccad66ab14fe66568 --- .pre-commit-config.yaml | 2 +- doc/requirements.txt | 2 +- zuul.d/devstack-tobiko-designate.yaml | 1 + zuul.d/devstack-tobiko-heat.yaml | 1 + zuul.d/devstack-tobiko-minimal.yaml | 2 +- zuul.d/devstack-tobiko.yaml | 2 +- zuul.d/nodesets.yaml | 11 ++++++++++- 7 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ffdde1b..1e6759d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/adrienverge/yamllint.git - rev: v1.29.0 + rev: v1.31.0 hooks: - id: yamllint files: \.(yaml|yml)$ diff --git a/doc/requirements.txt b/doc/requirements.txt index ae5795d..f9dde2b 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -5,5 +5,5 @@ # As openstack job build-reno-releasenotes and Read The Docs page support only # one single requirements file for a project, we need to have one such file # which will include all project requirements -sphinx>=3.4.2 # BSD +sphinx>=3.4.2,<=4.4.0 # BSD sphinx_rtd_theme>=0.5.1,<1 # Apache-2.0 diff --git a/zuul.d/devstack-tobiko-designate.yaml b/zuul.d/devstack-tobiko-designate.yaml index 8a95820..cce9a23 100644 --- a/zuul.d/devstack-tobiko-designate.yaml +++ b/zuul.d/devstack-tobiko-designate.yaml @@ -20,6 +20,7 @@ - job: name: devstack-tobiko-designate parent: devstack-tobiko-minimal + nodeset: devstack-tobiko-focal voting: true required-projects: &REQUIRED_PROJECTS - opendev.org/openstack/designate diff --git a/zuul.d/devstack-tobiko-heat.yaml b/zuul.d/devstack-tobiko-heat.yaml index 0a4b886..aaa4e0b 100644 --- a/zuul.d/devstack-tobiko-heat.yaml +++ b/zuul.d/devstack-tobiko-heat.yaml @@ -15,6 +15,7 @@ - job: name: devstack-tobiko-heat parent: devstack-tobiko-minimal + nodeset: devstack-tobiko-focal required-projects: - openstack/heat voting: true diff --git a/zuul.d/devstack-tobiko-minimal.yaml b/zuul.d/devstack-tobiko-minimal.yaml index e835200..df1391b 100644 --- a/zuul.d/devstack-tobiko-minimal.yaml +++ b/zuul.d/devstack-tobiko-minimal.yaml @@ -17,7 +17,7 @@ abstract: false name: devstack-tobiko-minimal parent: devstack - nodeset: devstack-tobiko + nodeset: devstack-tobiko-jammy voting: true description: | Minimal Devstack Tobiko Plugin job. diff --git a/zuul.d/devstack-tobiko.yaml b/zuul.d/devstack-tobiko.yaml index 89525d9..05843f8 100644 --- a/zuul.d/devstack-tobiko.yaml +++ b/zuul.d/devstack-tobiko.yaml @@ -20,7 +20,7 @@ abstract: false name: devstack-tobiko parent: devstack-tobiko-minimal - nodeset: devstack-tobiko + nodeset: devstack-tobiko-focal voting: true description: | Base Devstack Tobiko Plugin job. diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 6f95e10..62a8b4b 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -1,7 +1,7 @@ --- - nodeset: - name: devstack-tobiko + name: devstack-tobiko-focal nodes: - name: controller # label: ubuntu-focal @@ -12,6 +12,15 @@ - controller +- nodeset: + name: devstack-tobiko-jammy + nodes: + - name: controller + # label: ubuntu-jammy + label: nested-virt-ubuntu-jammy + groups: *STANDALONE_GROUPS + + - nodeset: name: devstack-tobiko-centos nodes: