commit 61c30d60f86f0dc29626334b146fb946ed5eb422
author Zuul <zuul@review.opendev.org> Tue May 16 13:39:13 2023 +0000
committer Gerrit Code Review <review@openstack.org> Tue May 16 13:39:13 2023 +0000
tree e9f03d0a5d6524ab4df204d431db1e47c3ccad50
parent 797aeb1303d6b7f80679ff75c35b14028130ec84
parent 4246d0b9fe084bace3858912f20bea65b7421979

Merge "[RBAC] Tests for Share Instance Export Locations"

zuul.d/manila-tempest-jobs.yaml

diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index d0d2fe6..faef5c6 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -38,6 +38,7 @@
         tls-proxy: true
       devstack_localrc:
         USE_PYTHON3: true
+        MYSQL_REDUCE_MEMORY: True
         MANILA_USE_DOWNGRADE_MIGRATIONS: true
         MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE: false
         MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST: true
@@ -353,7 +354,6 @@
 
 - job:
     name: manila-tempest-plugin-cephfs-native-base
-    nodeset: openstack-single-node-focal
     abstract: true
     description: Test CephFS Native (DHSS=False)
     parent: manila-tempest-plugin-base
@@ -393,6 +393,7 @@
 
 - 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
@@ -400,11 +401,13 @@
 - job:
     name: manila-tempest-plugin-cephfs-native-cephadm
     description: Test CephFS Native (DHSS=False) deployed with cephadm
-    parent: manila-tempest-plugin-cephfs-native
+    parent: manila-tempest-plugin-cephfs-native-base
     vars:
+      configure_swap_size: 8192
       tempest_test_regex: manila_tempest_tests.tests
       tempest_exclude_regex: '(^manila_tempest_tests.tests.scenario.*ceph_fuse.*)'
       devstack_localrc:
+        ENABLE_CEPH_NOVA: false
         CONTAINER_IMAGE: 'quay.io/ceph/ceph:v17.2.5'
         CEPHADM_DEPLOY: true
         CEPHADM_DEV_OSD: true