Enable volume multiattach tests in tempest-full/slow jobs
The volume multiattach tests originally required special
devstack configuration in Queens for the Ubuntu Cloud Archive,
but that is no longer necessary. This change enables the volume
multiattach tests in the tempest-full(-py3) and tempest-slow jobs
so we can drop the nova-multiattach job, which is mostly redundant
coverage of the tempest.api.compute.* tests, and reduce the total
number of jobs we run against nova/cinder/tempest changes.
Due to intermittent bug 1807723 when running the
test_volume_swap_with_multiattach test with two compute services,
that test is conditionally skipped if there is more than one compute.
This is probably no great loss in test coverage for now given
swapping multiattach volumes is likely rarely used (see bug 1775418).
Related ML thread:
http://lists.openstack.org/pipermail/openstack-dev/2018-October/135299.html
Depends-On: https://review.openstack.org/634977
Change-Id: I522a15ba3dbfee5d8ef417e43288a12319abf6ff
diff --git a/.zuul.yaml b/.zuul.yaml
index 8576455..6eaa2a5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -99,6 +99,7 @@
tox_envlist: full
devstack_localrc:
ENABLE_FILE_INJECTION: true
+ ENABLE_VOLUME_MULTIATTACH: true
- job:
name: tempest-full-oslo-master
@@ -161,6 +162,7 @@
devstack_localrc:
USE_PYTHON3: true
FORCE_CONFIG_DRIVE: true
+ ENABLE_VOLUME_MULTIATTACH: true
devstack_services:
s-account: false
s-container: false
@@ -276,6 +278,7 @@
tox_envlist: slow-serial
devstack_localrc:
CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2
+ ENABLE_VOLUME_MULTIATTACH: true
tempest_concurrency: 2
- job:
@@ -490,7 +493,7 @@
- ^playbooks/
- ^roles/
- ^.zuul.yaml$
- - nova-multiattach:
+ - tempest-full-parallel:
# Define list of irrelevant files to use everywhere else
irrelevant-files: &tempest-irrelevant-files
- ^(test-|)requirements.txt$
@@ -502,8 +505,6 @@
- ^tempest/hacking/.*$
- ^tempest/tests/.*$
- ^tools/.*$
- - tempest-full-parallel:
- irrelevant-files: *tempest-irrelevant-files
- tempest-full-py3:
irrelevant-files: *tempest-irrelevant-files
- tempest-full-py3-ipv6:
@@ -579,8 +580,6 @@
irrelevant-files: *tempest-irrelevant-files
gate:
jobs:
- - nova-multiattach:
- irrelevant-files: *tempest-irrelevant-files
- tempest-slow-py3:
irrelevant-files: *tempest-irrelevant-files
- neutron-grenade-multinode: