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
This commit is contained in:
Eduardo Olivares 2023-05-10 18:00:47 +02:00
parent 310eddd59b
commit e10a964110
7 changed files with 16 additions and 5 deletions

View File

@ -19,7 +19,7 @@ repos:
- id: trailing-whitespace - id: trailing-whitespace
- repo: https://github.com/adrienverge/yamllint.git - repo: https://github.com/adrienverge/yamllint.git
rev: v1.29.0 rev: v1.31.0
hooks: hooks:
- id: yamllint - id: yamllint
files: \.(yaml|yml)$ files: \.(yaml|yml)$

View File

@ -5,5 +5,5 @@
# As openstack job build-reno-releasenotes and Read The Docs page support only # 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 # one single requirements file for a project, we need to have one such file
# which will include all project requirements # 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 sphinx_rtd_theme>=0.5.1,<1 # Apache-2.0

View File

@ -20,6 +20,7 @@
- job: - job:
name: devstack-tobiko-designate name: devstack-tobiko-designate
parent: devstack-tobiko-minimal parent: devstack-tobiko-minimal
nodeset: devstack-tobiko-focal
voting: true voting: true
required-projects: &REQUIRED_PROJECTS required-projects: &REQUIRED_PROJECTS
- opendev.org/openstack/designate - opendev.org/openstack/designate

View File

@ -15,6 +15,7 @@
- job: - job:
name: devstack-tobiko-heat name: devstack-tobiko-heat
parent: devstack-tobiko-minimal parent: devstack-tobiko-minimal
nodeset: devstack-tobiko-focal
required-projects: required-projects:
- openstack/heat - openstack/heat
voting: true voting: true

View File

@ -17,7 +17,7 @@
abstract: false abstract: false
name: devstack-tobiko-minimal name: devstack-tobiko-minimal
parent: devstack parent: devstack
nodeset: devstack-tobiko nodeset: devstack-tobiko-jammy
voting: true voting: true
description: | description: |
Minimal Devstack Tobiko Plugin job. Minimal Devstack Tobiko Plugin job.

View File

@ -20,7 +20,7 @@
abstract: false abstract: false
name: devstack-tobiko name: devstack-tobiko
parent: devstack-tobiko-minimal parent: devstack-tobiko-minimal
nodeset: devstack-tobiko nodeset: devstack-tobiko-focal
voting: true voting: true
description: | description: |
Base Devstack Tobiko Plugin job. Base Devstack Tobiko Plugin job.

View File

@ -1,7 +1,7 @@
--- ---
- nodeset: - nodeset:
name: devstack-tobiko name: devstack-tobiko-focal
nodes: nodes:
- name: controller - name: controller
# label: ubuntu-focal # label: ubuntu-focal
@ -12,6 +12,15 @@
- controller - controller
- nodeset:
name: devstack-tobiko-jammy
nodes:
- name: controller
# label: ubuntu-jammy
label: nested-virt-ubuntu-jammy
groups: *STANDALONE_GROUPS
- nodeset: - nodeset:
name: devstack-tobiko-centos name: devstack-tobiko-centos
nodes: nodes: