Merge "Replace deprecated os_adm"
diff --git a/doc/source/supported_version.rst b/doc/source/supported_version.rst
index e97b6f4..968c821 100644
--- a/doc/source/supported_version.rst
+++ b/doc/source/supported_version.rst
@@ -9,6 +9,7 @@
Tempest master supports the below OpenStack Releases:
+* 2024.1
* 2023.2
* 2023.1
* Zed
diff --git a/releasenotes/notes/cleanup-decorator-aliases-e940b6e114e6f481.yaml b/releasenotes/notes/cleanup-decorator-aliases-e940b6e114e6f481.yaml
new file mode 100644
index 0000000..fd4a546
--- /dev/null
+++ b/releasenotes/notes/cleanup-decorator-aliases-e940b6e114e6f481.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+ - |
+ The following decorators are no longer available in the ``tempest.test``
+ module. Use the ``tempest.common.utils`` module instead.
+
+ - ``services``
+ - ``requires_ext``
+ - ``is_extension_enabled``
diff --git a/releasenotes/notes/remove-dns_servers_option-f49fdb2b4eb50f8f.yaml b/releasenotes/notes/remove-dns_servers_option-f49fdb2b4eb50f8f.yaml
new file mode 100644
index 0000000..6be1db9
--- /dev/null
+++ b/releasenotes/notes/remove-dns_servers_option-f49fdb2b4eb50f8f.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ The deprecated ``[network] dns_servers`` option has been removed.
diff --git a/releasenotes/notes/tempest-2024-1-release-d51f15c6bfe60b35.yaml b/releasenotes/notes/tempest-2024-1-release-d51f15c6bfe60b35.yaml
new file mode 100644
index 0000000..81d6a05
--- /dev/null
+++ b/releasenotes/notes/tempest-2024-1-release-d51f15c6bfe60b35.yaml
@@ -0,0 +1,17 @@
+---
+prelude: >
+ This release is to tag Tempest for OpenStack 2024.1 release.
+ This release marks the start of 2024.1 release support in Tempest.
+ After this release, Tempest will support below OpenStack Releases:
+
+ * 2024.1
+ * 2023.2
+ * 2023.1
+ * Zed
+
+ Current development of Tempest is for OpenStack 2024.2 development
+ cycle. Every Tempest commit is also tested against master during
+ the 2024.2 cycle. However, this does not necessarily mean that using
+ Tempest as of this tag will work against a 2024.2 (or future release)
+ cloud.
+ To be on safe side, use this tag to test the OpenStack 2024.1 release.
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index 989d3b5..e3018b4 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -6,6 +6,8 @@
:maxdepth: 1
unreleased
+ v38.0.0
+ v37.0.0
v36.0.0
v35.0.0
v34.2.0
diff --git a/releasenotes/source/v37.0.0.rst b/releasenotes/source/v37.0.0.rst
new file mode 100644
index 0000000..72b8bc6
--- /dev/null
+++ b/releasenotes/source/v37.0.0.rst
@@ -0,0 +1,6 @@
+=====================
+v37.0.0 Release Notes
+=====================
+
+.. release-notes:: 37.0.0 Release Notes
+ :version: 37.0.0
diff --git a/releasenotes/source/v38.0.0.rst b/releasenotes/source/v38.0.0.rst
new file mode 100644
index 0000000..2664374
--- /dev/null
+++ b/releasenotes/source/v38.0.0.rst
@@ -0,0 +1,6 @@
+=====================
+v38.0.0 Release Notes
+=====================
+
+.. release-notes:: 38.0.0 Release Notes
+ :version: 38.0.0
diff --git a/tempest/config.py b/tempest/config.py
index 8ed1ff6..0a084ea 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -766,13 +766,6 @@
default=1,
help="Time in seconds between network operation status "
"checks."),
- cfg.ListOpt('dns_servers',
- default=["8.8.8.8", "8.8.4.4"],
- help="List of dns servers which should be used"
- " for subnet creation",
- deprecated_for_removal=True,
- deprecated_reason="This config option is no longer "
- "used anywhere, so it can be removed."),
cfg.StrOpt('port_vnic_type',
choices=[None, 'normal', 'direct', 'macvtap', 'direct-physical',
'baremetal', 'virtio-forwarder'],
diff --git a/tempest/test.py b/tempest/test.py
index 3360221..a766367 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -26,7 +26,6 @@
from tempest import clients
from tempest.common import credentials_factory as credentials
-from tempest.common import utils
from tempest import config
from tempest.lib.common import api_microversion_fixture
from tempest.lib.common import fixed_network
@@ -45,20 +44,6 @@
version='Pike', removal_version='?')
-services = debtcollector.moves.moved_function(
- utils.services, 'services', __name__,
- version='Pike', removal_version='?')
-
-
-requires_ext = debtcollector.moves.moved_function(
- utils.requires_ext, 'requires_ext', __name__,
- version='Pike', removal_version='?')
-
-
-is_extension_enabled = debtcollector.moves.moved_function(
- utils.is_extension_enabled, 'is_extension_enabled', __name__,
- version='Pike', removal_version='?')
-
at_exit_set = set()
diff --git a/zuul.d/integrated-gate.yaml b/zuul.d/integrated-gate.yaml
index 89b1125..596acb1 100644
--- a/zuul.d/integrated-gate.yaml
+++ b/zuul.d/integrated-gate.yaml
@@ -416,11 +416,12 @@
voting: false
branches:
- stable/2023.1
- # on master (SLURP 2024.1) grenade-skip-level which test stable/2023.1
- # to stable/2024.1 upgrade is voting.
+ # on stable/2024.1(SLURP) grenade-skip-level is voting which test
+ # stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
+ # SLURP release only.
- grenade-skip-level:
branches:
- - master
+ - ^.*/2024.1
- tempest-integrated-networking
# Do not run it on ussuri until below issue is fixed
# https://storyboard.openstack.org/#!/story/2010057
@@ -434,11 +435,12 @@
jobs:
- grenade
- tempest-integrated-networking
- # on master (SLURP 2024.1) grenade-skip-level which test stable/2023.1
- # to stable/2024.1 upgrade is voting.
+ # on stable/2024.1(SLURP) grenade-skip-level is voting which test
+ # stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
+ # SLURP release only.
- grenade-skip-level:
branches:
- - master
+ - ^.*/2024.1
# Do not run it on ussuri until below issue is fixed
# https://storyboard.openstack.org/#!/story/2010057
# and job is broken up to wallaby branch due to the issue
@@ -477,6 +479,8 @@
# to make sure we do not run this job on older than 2023.2 gate.
- grenade-skip-level-always:
branches:
+ - ^.*/2023.2
+ - ^.*/2024.1
- master
- tempest-integrated-compute
# centos-8-stream is tested from wallaby -> yoga branches
@@ -494,6 +498,8 @@
jobs:
- grenade-skip-level-always:
branches:
+ - ^.*/2023.2
+ - ^.*/2024.1
- master
- tempest-integrated-compute
- openstacksdk-functional-devstack:
@@ -525,11 +531,12 @@
voting: false
branches:
- stable/2023.1
- # on master (SLURP 2024.1) grenade-skip-level which test stable/2023.1
- # to stable/2024.1 upgrade is voting.
+ # on stable/2024.1(SLURP) grenade-skip-level is voting which test
+ # stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
+ # SLURP release only.
- grenade-skip-level:
branches:
- - master
+ - ^.*/2024.1
- tempest-integrated-placement
# Do not run it on ussuri until below issue is fixed
# https://storyboard.openstack.org/#!/story/2010057
@@ -543,11 +550,12 @@
jobs:
- grenade
- tempest-integrated-placement
- # on master (SLURP 2024.1) grenade-skip-level which test stable/2023.1
- # to stable/2024.1 upgrade is voting.
+ # on stable/2024.1(SLURP) grenade-skip-level is voting which test
+ # stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
+ # SLURP release only.
- grenade-skip-level:
branches:
- - master
+ - ^.*/2024.1
# Do not run it on ussuri until below issue is fixed
# https://storyboard.openstack.org/#!/story/2010057
# and job is broken up to wallaby branch due to the issue
@@ -574,11 +582,12 @@
voting: false
branches:
- stable/2023.1
- # on master (SLURP 2024.1) grenade-skip-level which test stable/2023.1
- # to stable/2024.1 upgrade is voting.
+ # on stable/2024.1(SLURP) grenade-skip-level is voting which test
+ # stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
+ # SLURP release only.
- grenade-skip-level:
branches:
- - master
+ - ^.*/2024.1
- tempest-integrated-storage
# Do not run it on ussuri until below issue is fixed
# https://storyboard.openstack.org/#!/story/2010057
@@ -591,11 +600,12 @@
gate:
jobs:
- grenade
- # on master (SLURP 2024.1) grenade-skip-level which test stable/2023.1
- # to stable/2024.1 upgrade is voting.
+ # on stable/2024.1(SLURP) grenade-skip-level is voting which test
+ # stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
+ # SLURP release only.
- grenade-skip-level:
branches:
- - master
+ - ^.*/2024.1
- tempest-integrated-storage
# Do not run it on ussuri until below issue is fixed
# https://storyboard.openstack.org/#!/story/2010057
@@ -616,11 +626,12 @@
check:
jobs:
- grenade
- # on master (SLURP 2024.1) grenade-skip-level which test stable/2023.1
- # to stable/2024.1 upgrade is voting.
+ # on stable/2024.1(SLURP) grenade-skip-level is voting which test
+ # stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
+ # SLURP release only.
- grenade-skip-level:
branches:
- - master
+ - ^.*/2024.1
- tempest-integrated-object-storage
# Do not run it on ussuri until below issue is fixed
# https://storyboard.openstack.org/#!/story/2010057
@@ -633,11 +644,12 @@
gate:
jobs:
- grenade
- # on master (SLURP 2024.1) grenade-skip-level which test stable/2023.1
- # to stable/2024.1 upgrade is voting.
+ # on stable/2024.1(SLURP) grenade-skip-level is voting which test
+ # stable/2023.1 to stable/2024.1 upgrade. This is supposed to run on
+ # SLURP release only.
- grenade-skip-level:
branches:
- - master
+ - ^.*/2024.1
- tempest-integrated-object-storage
# Do not run it on ussuri until below issue is fixed
# https://storyboard.openstack.org/#!/story/2010057
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 210717a..e2505cb 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -37,7 +37,7 @@
# if things are working in latest and oldest it will work in between
# stable branches also. If anything is breaking we will be catching
# those in respective stable branch gate.
- - tempest-full-2023-2:
+ - tempest-full-2024-1:
irrelevant-files: *tempest-irrelevant-files
- tempest-full-zed:
irrelevant-files: *tempest-irrelevant-files
@@ -111,7 +111,7 @@
irrelevant-files: *tempest-irrelevant-files
- grenade:
irrelevant-files: *tempest-irrelevant-files
- - grenade-skip-level:
+ - grenade-skip-level-always:
irrelevant-files: *tempest-irrelevant-files
- neutron-ovs-tempest-dvr:
voting: false
@@ -142,7 +142,7 @@
irrelevant-files: *tempest-irrelevant-files
- grenade:
irrelevant-files: *tempest-irrelevant-files
- - grenade-skip-level:
+ - grenade-skip-level-always:
irrelevant-files: *tempest-irrelevant-files
- tempest-ipv6-only:
irrelevant-files: *tempest-irrelevant-files-3
@@ -189,12 +189,15 @@
irrelevant-files: *tempest-irrelevant-files
periodic-stable:
jobs:
+ - tempest-full-2024-1
- tempest-full-2023-2
- tempest-full-2023-1
- tempest-full-zed
+ - tempest-slow-2024-1
- tempest-slow-2023-2
- tempest-slow-2023-1
- tempest-slow-zed
+ - tempest-full-2024-1-extra-tests
- tempest-full-2023-2-extra-tests
- tempest-full-2023-1-extra-tests
- tempest-full-zed-extra-tests
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 501d2ec..a662685 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -1,5 +1,11 @@
# NOTE(gmann): This file includes all stable release jobs definition.
- job:
+ name: tempest-full-2024-1
+ parent: tempest-full-py3
+ nodeset: openstack-single-node-jammy
+ override-checkout: stable/2024.1
+
+- job:
name: tempest-full-2023-2
parent: tempest-full-py3
nodeset: openstack-single-node-jammy
@@ -18,6 +24,12 @@
override-checkout: stable/zed
- job:
+ name: tempest-full-2024-1-extra-tests
+ parent: tempest-extra-tests
+ nodeset: openstack-single-node-jammy
+ override-checkout: stable/2024.1
+
+- job:
name: tempest-full-2023-2-extra-tests
parent: tempest-extra-tests
nodeset: openstack-single-node-jammy
@@ -36,6 +48,12 @@
override-checkout: stable/zed
- job:
+ name: tempest-slow-2024-1
+ parent: tempest-slow-py3
+ nodeset: openstack-two-node-jammy
+ override-checkout: stable/2024.1
+
+- job:
name: tempest-slow-2023-2
parent: tempest-slow-py3
nodeset: openstack-two-node-jammy
@@ -65,8 +83,8 @@
# This job version is to use the 'full' tox env which
# is available for stable/ussuri to stable/wallaby also.
branches:
- - stable/victoria
- - stable/wallaby
+ - ^.*/victoria
+ - ^.*/wallaby
description: |
Base integration test with Neutron networking, horizon, swift enable,
and py3.
@@ -94,11 +112,11 @@
nodeset: openstack-two-node-focal
# This job runs on Focal and supposed to run until stable/zed.
branches:
- - stable/victoria
- - stable/wallaby
- - stable/xena
- - unmaintained/yoga
- - stable/zed
+ - ^.*/victoria
+ - ^.*/wallaby
+ - ^.*/xena
+ - ^.*/yoga
+ - ^.*/zed
vars:
devstack_localrc:
USE_PYTHON3: true
@@ -117,11 +135,11 @@
nodeset: openstack-two-node-focal
# This job runs on Focal and on python2. This is for stable/victoria to stable/zed.
branches:
- - stable/victoria
- - stable/wallaby
- - stable/xena
- - unmaintained/yoga
- - stable/zed
+ - ^.*/victoria
+ - ^.*/wallaby
+ - ^.*/xena
+ - ^.*/yoga
+ - ^.*/zed
vars:
devstack_localrc:
USE_PYTHON3: False
@@ -136,8 +154,8 @@
# This job version is to use the 'slow-serial' tox env for
# the stable/ussuri to stable/wallaby testing.
branches:
- - stable/victoria
- - stable/wallaby
+ - ^.*/victoria
+ - ^.*/wallaby
vars:
tox_envlist: slow-serial
@@ -152,12 +170,9 @@
# This job is not used after stable/xena and can be
# removed once stable/xena is EOL.
branches:
- - stable/stein
- - stable/train
- - stable/ussuri
- - stable/victoria
- - stable/wallaby
- - stable/xena
+ - ^.*/victoria
+ - ^.*/wallaby
+ - ^.*/xena
- job:
name: tempest-integrated-compute-centos-8-stream
@@ -166,9 +181,9 @@
voting: false
nodeset: devstack-single-node-centos-8-stream
branches:
- - stable/wallaby
- - stable/xena
- - unmaintained/yoga
+ - ^.*/wallaby
+ - ^.*/xena
+ - ^.*/yoga
description: |
This job runs integration tests for compute. This is
subset of 'tempest-full-py3' job and run Nova, Neutron, Cinder (except backup tests)
@@ -185,9 +200,9 @@
# TODO(gmann): Make this job non voting until bug#1957941 if fixed.
voting: false
branches:
- - stable/wallaby
- - stable/xena
- - unmaintained/yoga
+ - ^.*/wallaby
+ - ^.*/xena
+ - ^.*/yoga
nodeset: devstack-single-node-centos-8-stream
description: |
Base integration test with Neutron networking and py36 running