Merge "Reduce test resource consumption cephfs-nfs"
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index 6a59fda..f36a6d9 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -174,8 +174,8 @@
environment with IPv6 control plane endpoints.
parent: manila-tempest-plugin-ipv6-base
abstract: true
- required-projects:
- - openstack/neutron-dynamic-routing
+ # TODO(carloss): enable neutron-dynamic-routing setup when LP #1998489
+ # is fixed.
vars:
tempest_test_regex: '(^manila_tempest_tests.tests)(?=.*\[.*\bbackend\b.*\])'
devstack_services: &devstack-with-ovs
@@ -194,6 +194,7 @@
q-l3: true
q-meta: true
q-metering: true
+ openstack-cli-server: true
devstack_localrc:
# NOTE(gouthamr): LP#1940324 prevents bgp usage with OVN, use OVS
Q_AGENT: openvswitch
@@ -213,8 +214,8 @@
MANILA_SETUP_IPV6: true
NEUTRON_CREATE_INITIAL_NETWORKS: false
MANILA_RESTORE_IPV6_DEFAULT_ROUTE: false
- devstack_plugins:
- neutron-dynamic-routing: https://opendev.org/openstack/neutron-dynamic-routing
+ # TODO(carloss): enable neutron-dynamic-routing setup when LP #1998489
+ # is fixed.
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
@@ -433,7 +434,8 @@
parent: manila-tempest-plugin-base
required-projects:
- openstack/devstack-plugin-ceph
- - openstack/neutron-dynamic-routing
+ # TODO(carloss): enable neutron-dynamic-routing setup when LP #1998489
+ # is fixed.
vars:
tempest_concurrency: 2
# turning off some tests due to exhaustion of disk space
@@ -444,7 +446,8 @@
devstack_services: *devstack-with-ovs # LP 1940324
devstack_plugins:
devstack-plugin-ceph: https://opendev.org/openstack/devstack-plugin-ceph
- neutron-dynamic-routing: https://opendev.org/openstack/neutron-dynamic-routing
+ # TODO(carloss): enable neutron-dynamic-routing setup when LP #1998489
+ # is fixed.
devstack_localrc:
# NOTE(gouthamr): LP#1940324 prevents bgp usage with OVN, use OVS
Q_AGENT: openvswitch
@@ -500,7 +503,7 @@
TARGET_DEV_OSD_DIR: /opt/stack
ENABLED_SHARE_PROTOCOLS: NFS
MANILA_OPTGROUP_cephfsnfs_cephfs_ganesha_server_ip: "{{ hostvars[inventory_hostname]['nodepool']['private_ipv4'] }}"
- CEPH_RELEASE: "quincy"
+ CEPH_RELEASE: "reef"
MANILA_SETUP_IPV6: false
NEUTRON_CREATE_INITIAL_NETWORKS: true
IP_VERSION: 4