openstack/devstack
Code Issues Proposed changes

Merge "Drop nodesets with ubuntu-xenial"

Browse Source
This commit is contained in:
Zuul 2024-02-26 21:04:24 +00:00 committed by Gerrit Code Review
commit 57c685496f
2 changed files with 2 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
.zuul.yaml
View File

@ -1,13 +1,3 @@
- nodeset:
name: openstack-single-node
nodes:
- name: controller
label: ubuntu-xenial
groups:
- name: tempest
nodes:
- controller
- nodeset: - nodeset:
name: openstack-single-node-jammy name: openstack-single-node-jammy
nodes: nodes:
@ -38,16 +28,6 @@
nodes: nodes:
- controller - controller
- nodeset:
name: openstack-single-node-xenial
nodes:
- name: controller
label: ubuntu-xenial
groups:
- name: tempest
nodes:
- controller
- nodeset: - nodeset:
name: devstack-single-node-centos-7 name: devstack-single-node-centos-7
nodes: nodes:
@ -118,36 +98,6 @@
nodes: nodes:
- controller - controller
- nodeset:
name: openstack-two-node
nodes:
- name: controller
label: ubuntu-xenial
- name: compute1
label: ubuntu-xenial
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: - nodeset:
name: openstack-two-node-centos-9-stream name: openstack-two-node-centos-9-stream
nodes: nodes:
@ -268,36 +218,6 @@
nodes: nodes:
- compute1 - compute1
- nodeset:
name: openstack-two-node-xenial
nodes:
- name: controller
label: ubuntu-xenial
- name: compute1
label: ubuntu-xenial
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: - nodeset:
name: openstack-three-node-focal name: openstack-three-node-focal
nodes: nodes:

4
functions-common
View File

@ -401,9 +401,9 @@ function warn {
# such as "install_package" further abstract things in better ways. # such as "install_package" further abstract things in better ways.
# #
# ``os_VENDOR`` - vendor name: ``Ubuntu``, ``Fedora``, etc # ``os_VENDOR`` - vendor name: ``Ubuntu``, ``Fedora``, etc
# ``os_RELEASE`` - major release: ``16.04`` (Ubuntu), ``23`` (Fedora) # ``os_RELEASE`` - major release: ``22.04`` (Ubuntu), ``23`` (Fedora)
# ``os_PACKAGE`` - package type: ``deb`` or ``rpm`` # ``os_PACKAGE`` - package type: ``deb`` or ``rpm``
# ``os_CODENAME`` - vendor's codename for release: ``xenial`` # ``os_CODENAME`` - vendor's codename for release: ``jammy``
declare -g os_VENDOR os_RELEASE os_PACKAGE os_CODENAME declare -g os_VENDOR os_RELEASE os_PACKAGE os_CODENAME