Merge "Moving API microversion fixture in resource_setup"
diff --git a/.zuul.yaml b/.zuul.yaml
index 80eabe8..2b6b59c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -25,9 +25,9 @@
# branches. That is what we need to do for all tempest plugins. Only jobs
# for the current releasable ("Maintained") stable branches should be listed
# here.
+ - cinder-tempest-plugin-basic-2023-2
+ - cinder-tempest-plugin-basic-2023-1
- cinder-tempest-plugin-basic-zed
- - cinder-tempest-plugin-basic-yoga
- - cinder-tempest-plugin-basic-xena
- cinder-tempest-plugin-protection-functional
gate:
jobs:
@@ -38,9 +38,9 @@
- cinder-tempest-plugin-cbak-ceph
experimental:
jobs:
+ - cinder-tempest-plugin-cbak-ceph-2023-2
+ - cinder-tempest-plugin-cbak-ceph-2023-1
- cinder-tempest-plugin-cbak-ceph-zed
- - cinder-tempest-plugin-cbak-ceph-yoga
- - cinder-tempest-plugin-cbak-ceph-xena
- job:
name: cinder-tempest-plugin-protection-functional
@@ -51,10 +51,13 @@
vars:
tox_envlist: all
tempest_test_regex: 'cinder_tempest_plugin.rbac'
+ devstack_localrc:
+ KEYSTONE_ENFORCE_SCOPE: True
devstack_local_conf:
test-config:
$CINDER_CONF:
oslo_policy:
+ enforce_scope: True
enforce_new_defaults: True
$TEMPEST_CONFIG:
enforce_scope:
@@ -72,6 +75,7 @@
- opendev.org/openstack/cinder-tempest-plugin
- opendev.org/openstack/cinder
vars:
+ configure_swap_size: 8192
tempest_test_regex: '(^tempest\.(api|scenario)|(^cinder_tempest_plugin))'
tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/tempest"].src_dir }}/tools/tempest-integrated-gate-storage-exclude-list.txt'
# Temporarily exclude TestMultiAttachVolumeSwap until LP bug #1980816 is resolved.
@@ -106,6 +110,7 @@
devstack_plugins:
barbican: https://opendev.org/openstack/barbican
vars:
+ configure_swap_size: 8192
tempest_test_regex: '(^tempest\.(api|scenario)|(^cinder_tempest_plugin))'
tox_envlist: all
devstack_localrc:
@@ -134,9 +139,22 @@
- job:
name: cinder-tempest-plugin-lvm-barbican-base
description: |
+ This is a base job for lvm with lio & tgt targets.
+ No cinderlib testing beginning with 2024.1 development.
+ # FIXME: the following RE2 expression won't work after the 9999.2 release.
+ # If you are reading this during the 9999.2 development cycle, greetings
+ # from the 21st century!
+ branches: ^(master|(stable/(202[4-9]|20[3-9]\d|2[1-9]\d\d|[3-9]\d\d\d))\.[12])$
+ parent: cinder-tempest-plugin-lvm-barbican-base-abstract
+ vars:
+ tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/tempest"].src_dir }}/tools/tempest-integrated-gate-storage-exclude-list.txt'
+
+- job:
+ name: cinder-tempest-plugin-lvm-barbican-base
+ description: |
This is a base job for lvm with lio & tgt targets
with cinderlib tests.
- branches: ^(master|stable/(xena|yoga|zed|2\d\d\d\.[12])).*$
+ branches: ^(stable/(xena|yoga|zed|2023\.[12]))$
parent: cinder-tempest-plugin-lvm-barbican-base-abstract
roles:
- zuul: opendev.org/openstack/cinderlib
@@ -214,7 +232,6 @@
- stable/ussuri
parent: cinder-tempest-plugin-lvm-barbican-base-abstract
required-projects:
- - opendev.org/openstack/cinderlib
- name: opendev.org/openstack/cinder-tempest-plugin
override-checkout: 1.3.0
vars:
@@ -252,29 +269,23 @@
timeout: 10800
- job:
+ name: cinder-tempest-plugin-cbak-ceph-2023-2
+ parent: cinder-tempest-plugin-cbak-ceph
+ nodeset: openstack-single-node-jammy
+ override-checkout: stable/2023.2
+
+- job:
+ name: cinder-tempest-plugin-cbak-ceph-2023-1
+ parent: cinder-tempest-plugin-cbak-ceph
+ nodeset: openstack-single-node-jammy
+ override-checkout: stable/2023.1
+
+- job:
name: cinder-tempest-plugin-cbak-ceph-zed
parent: cinder-tempest-plugin-cbak-ceph
nodeset: openstack-single-node-focal
override-checkout: stable/zed
-- job:
- name: cinder-tempest-plugin-cbak-ceph-yoga
- parent: cinder-tempest-plugin-cbak-ceph
- nodeset: openstack-single-node-focal
- override-checkout: stable/yoga
-
-- job:
- name: cinder-tempest-plugin-cbak-ceph-xena
- parent: cinder-tempest-plugin-cbak-ceph
- nodeset: openstack-single-node-focal
- override-checkout: stable/xena
-
-- job:
- name: cinder-tempest-plugin-cbak-ceph-wallaby
- parent: cinder-tempest-plugin-cbak-ceph
- nodeset: openstack-single-node-focal
- override-checkout: stable/wallaby
-
# variant for pre-Ussuri branches (no volume revert for Ceph),
# should this job be used on those branches
- job:
@@ -322,7 +333,6 @@
under FIPS mode
pre-run: playbooks/enable-fips.yaml
vars:
- configure_swap_size: 4096
nslookup_target: 'opendev.org'
tempest_exclude_regex: 'test_encrypted_cinder_volumes_cryptsetup'
@@ -406,19 +416,19 @@
- ^releasenotes/.*$
- job:
+ name: cinder-tempest-plugin-basic-2023-2
+ parent: cinder-tempest-plugin-basic
+ nodeset: openstack-single-node-jammy
+ override-checkout: stable/2023.2
+
+- job:
+ name: cinder-tempest-plugin-basic-2023-1
+ parent: cinder-tempest-plugin-basic
+ nodeset: openstack-single-node-jammy
+ override-checkout: stable/2023.1
+
+- job:
name: cinder-tempest-plugin-basic-zed
parent: cinder-tempest-plugin-basic
nodeset: openstack-single-node-focal
override-checkout: stable/zed
-
-- job:
- name: cinder-tempest-plugin-basic-yoga
- parent: cinder-tempest-plugin-basic
- nodeset: openstack-single-node-focal
- override-checkout: stable/yoga
-
-- job:
- name: cinder-tempest-plugin-basic-xena
- parent: cinder-tempest-plugin-basic
- nodeset: openstack-single-node-focal
- override-checkout: stable/xena