[stable-only] Fix gate and remove zuul config error

This is a combination of 2 commits.

1. [Stable-Only] Pin setuptools for tox docs

This was somehow missing from the cherry-pick of the original fix [0].

Furthermore, swift-dsvm-functional started to fail on this branch, so
to quickly unblock the gate, it is set as non-voting, until it will be
fixed.

[0] https://review.opendev.org/c/openstack/devstack/+/976107

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
(cherry picked from commit 52370443b3)

2. Drop openstack-*-node-bionic nodeset definitions

In order to be able to edit these on the master branch, we need to drop
them on the stable branches first.

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: Ibf1bf5454a4dd63b617963b70ce9bfec83de4916
(cherry picked from commit e5e266335e)
This commit is contained in:
Dr. Jens Harbott
2026-02-17 13:00:07 +01:00
committed by Elod Illes
parent 1899ecb47b
commit 3219be6c4b
2 changed files with 5 additions and 77 deletions
+4 -77
View File
@@ -18,16 +18,6 @@
nodes:
- controller
- nodeset:
name: openstack-single-node-bionic
nodes:
- name: controller
label: ubuntu-bionic
groups:
- name: tempest
nodes:
- controller
- nodeset:
name: devstack-single-node-centos-9-stream
nodes:
@@ -158,36 +148,6 @@
nodes:
- compute1
- nodeset:
name: openstack-two-node-bionic
nodes:
- name: controller
label: ubuntu-bionic
- name: compute1
label: ubuntu-bionic
groups:
# Node where tests are executed and test results collected
- name: tempest
nodes:
- controller
# Nodes running the compute service
- name: compute
nodes:
- controller
- compute1
# Nodes that are not the controller
- name: subnode
nodes:
- compute1
# Switch node for multinode networking setup
- name: switch
nodes:
- controller
# Peer nodes for multinode networking setup
- name: peers
nodes:
- compute1
- nodeset:
name: openstack-three-node-focal
nodes:
@@ -223,41 +183,6 @@
- compute1
- compute2
- nodeset:
name: openstack-three-node-bionic
nodes:
- name: controller
label: ubuntu-bionic
- name: compute1
label: ubuntu-bionic
- name: compute2
label: ubuntu-bionic
groups:
# Node where tests are executed and test results collected
- name: tempest
nodes:
- controller
# Nodes running the compute service
- name: compute
nodes:
- controller
- compute1
- compute2
# Nodes that are not the controller
- name: subnode
nodes:
- compute1
- compute2
# Switch node for multinode networking setup
- name: switch
nodes:
- controller
# Peer nodes for multinode networking setup
- name: peers
nodes:
- compute1
- compute2
- job:
name: devstack-base
parent: openstack-multinode-fips
@@ -774,7 +699,8 @@
- devstack-unit-tests
- openstack-tox-bashate
- ironic-tempest-bios-ipmi-direct-tinyipa
- swift-dsvm-functional
- swift-dsvm-functional:
voting: false
- grenade:
irrelevant-files:
- ^.*\.rst$
@@ -819,7 +745,8 @@
- ^.*\.rst$
- ^doc/.*$
- ironic-tempest-bios-ipmi-direct-tinyipa
- swift-dsvm-functional
- swift-dsvm-functional:
voting: false
- grenade:
irrelevant-files:
- ^.*\.rst$
+1
View File
@@ -37,6 +37,7 @@ commands = bash -c "find {toxinidir} \
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1}
-r{toxinidir}/doc/requirements.txt
setuptools<81
allowlist_externals = bash
setenv =
TOP_DIR={toxinidir}