Merge "[RBAC] Add share groups tests"
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index 690b8bc..92ec2d8 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -162,11 +162,12 @@
name: manila-tempest-plugin-zfsonlinux
description: Test ZFSOnLinux multibackend (DHSS=False) with postgresql db
parent: manila-tempest-plugin-zfsonlinux-base
- branches: &ubuntu_jammy_test_image_branches ^(?!stable/(yoga|xena|wallaby|victoria|ussuri)).*$
+ branches: &ubuntu_jammy_test_image_branches
+ regex: ^stable/(yoga|xena|wallaby|victoria|ussuri)$
+ negate: true
- job:
name: manila-tempest-plugin-lvm-base
- nodeset: openstack-single-node-focal
description: |
Test LVM multibackend (DHSS=False) in a 4+6 (dual-stack) devstack
environment with IPv6 control plane endpoints.
@@ -176,6 +177,7 @@
- openstack/neutron-dynamic-routing
vars:
tempest_test_regex: '(^manila_tempest_tests.tests)(?=.*\[.*\bbackend\b.*\])'
+ tempest_exclude_regex: "(^manila_tempest_tests.tests.scenario.*)"
devstack_services: &devstack-with-ovs
# NOTE(gouthamr): LP#1940324 prevents bgp usage with OVN, disable OVN
br-ex-tcpdump: false
@@ -230,13 +232,25 @@
multi_backend: true
image_password: manila
+# NOTE(carloss): Nova bumped libvirt to a version available only on Ubuntu
+# Jammy. We are then forced to migrate this job to use Jammy. When LP Bug
+#1998489 is fixed, we will be able to unify the job above with this.
- job:
name: manila-tempest-plugin-lvm
description: |
- Test LVM multibackend (DHSS=False) in a 4+6 (dual-stack) devstack
- environment with IPv6 control plane endpoints.
- branches: *ubuntu_jammy_test_image_branches
+ Test LVM multibackend (DHSS=False) in a IPv4 environment.
+ branches:
+ regex: ^stable/(2023.1|zed|yoga|xena|wallaby|victoria|ussuri)$
+ negate: true
parent: manila-tempest-plugin-lvm-base
+ vars:
+ devstack_localrc:
+ MANILA_SETUP_IPV6: false
+ devstack_local_conf:
+ test-config:
+ $TEMPEST_CONFIG:
+ share:
+ run_ipv6_tests: false
- job:
name: manila-tempest-plugin-container
@@ -393,7 +407,6 @@
- job:
name: manila-tempest-plugin-cephfs-native
- nodeset: openstack-single-node-focal
description: Test CephFS Native (DHSS=False)
parent: manila-tempest-plugin-cephfs-native-base
branches: *ubuntu_jammy_test_image_branches
@@ -619,7 +632,6 @@
description: |
Test the GlusterFS driver (DHSS=False) with the native GlusterFS protocol
parent: manila-tempest-plugin-standalone-base
- nodeset: openstack-single-node-focal
required-projects:
- x/devstack-plugin-glusterfs
vars:
@@ -652,7 +664,6 @@
description: |
Test the GlusterFS driver (DHSS=False) with the native NFS protocol
parent: manila-tempest-plugin-standalone-base
- nodeset: openstack-single-node-focal
required-projects:
- x/devstack-plugin-glusterfs
vars:
@@ -723,7 +734,9 @@
- job:
name: manila-tempest-plugin-lvm-fips
parent: manila-tempest-plugin-lvm-fips-base
- branches: ^(?!stable/(yoga|xena|wallaby|victoria|ussuri)).*$
+ branches:
+ regex: ^stable/(yoga|xena|wallaby|victoria|ussuri)$
+ negate: true
- project-template:
name: manila-tempest-plugin-jobs-using-service-image
diff --git a/zuul.d/manila-tempest-stable-jobs.yaml b/zuul.d/manila-tempest-stable-jobs.yaml
index 28db229..0fb38ab 100644
--- a/zuul.d/manila-tempest-stable-jobs.yaml
+++ b/zuul.d/manila-tempest-stable-jobs.yaml
@@ -7,7 +7,7 @@
Test the scenario test cases on the generic driver multibackend
(DHSS=True) with NFS and CIFS
parent: manila-tempest-plugin-generic-scenario-base
- branches: &manila_tempest_image_pinned_branches ^(stable/(zed|yoga|xena)).*$
+ branches: &manila_tempest_image_pinned_branches ^stable/(2023.1|zed|yoga|xena)$
vars: &manila_tempest_image_pinned_vars
devstack_localrc:
# NOTE(carloss): Pinning manila service image to a Focal version,
@@ -27,15 +27,12 @@
- job:
name: manila-tempest-plugin-lvm-stable
- # NOTE(carloss): we are aware that focal is the current default, but
- # in order to avoid breakages when devstack-minimal switches to a newer
- # branch, we are pinning focal here.
- nodeset: openstack-single-node-focal
description: |
Test LVM multibackend (DHSS=False) in a 4+6 (dual-stack) devstack
environment with IPv6 control plane endpoints.
branches: *manila_tempest_image_pinned_branches
parent: manila-tempest-plugin-lvm-base
+ nodeset: openstack-single-node-focal
vars: *manila_tempest_image_pinned_vars
- job:
@@ -68,20 +65,18 @@
- job:
name: manila-tempest-plugin-lvm-fips-stable
parent: manila-tempest-plugin-lvm-fips-base
- branches: ^(stable/(yoga|xena)).*$
+ branches: ^stable/(yoga|xena)$
vars: *manila_tempest_image_pinned_vars
- job:
name: manila-tempest-plugin-lvm-yoga
parent: manila-tempest-plugin-lvm-base
- nodeset: openstack-single-node-focal
override-checkout: stable/yoga
vars: *manila_tempest_image_pinned_vars
- job:
name: manila-tempest-plugin-lvm-xena
parent: manila-tempest-plugin-lvm-base
- nodeset: openstack-single-node-focal
override-checkout: stable/xena
vars: *manila_tempest_image_pinned_vars