Revert "cinder-storpool jobs: Reparent to tempest-full-py3"
This reverts commit 1ebc1a70ad6cc21e2827c796eb97790e7c6563b2.
Reason for revert: Might not have been needed
Change-Id: I6b2dc4b0748efef54efb1390249a900d2e867ea4
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index 49cbc17..5a026b2 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -28,7 +28,6 @@
###
# Copied from upstream, remove unsupported `failure-output` option
-
- job:
name: devstack-tempest
parent: devstack
@@ -73,11 +72,38 @@
run: playbooks/devstack-tempest.yaml
post-run: playbooks/post-tempest.yaml
+# Copied from upstream, where it has been removed
+- job:
+ name: tempest-full
+ parent: devstack-tempest
+ description: |
+ Base integration test with Neutron networking and py27.
+ This job is supposed to run until stable/train setup only.
+ If you are running it on stable/ussuri gate onwards for python2.7
+ coverage then you need to do override-checkout with any stable
+ branch less than or equal to stable/train.
+ Former names for this job where:
+ * legacy-tempest-dsvm-neutron-full
+ * gate-tempest-dsvm-neutron-full-ubuntu-xenial
+ vars:
+ tox_envlist: full
+ devstack_localrc:
+ ENABLE_FILE_INJECTION: true
+ ENABLE_VOLUME_MULTIATTACH: true
+ USE_PYTHON3: False
+ devstack_services:
+ # NOTE(mriedem): Disable the cinder-backup service from tempest-full
+ # since tempest-full is in the integrated-gate project template but
+ # the backup tests do not really involve other services so they should
+ # be run in some more cinder-specific job, especially because the
+ # tests fail at a high rate (see bugs 1483434, 1813217, 1745168)
+ c-bak: false
+
###
- job:
name: cinder-storpool-tempest
- parent: tempest-full-py3
+ parent: tempest-full
pre-run:
- playbooks/workarounds/01-disable-unattended-upgrades.yaml
- playbooks/workarounds/02-install-linux-modules-extra-for-z3fold.yaml
@@ -207,7 +233,7 @@
- job:
name: cinder-storpool-tempest-iscsi-multipath-parent
- parent: tempest-full-py3
+ parent: tempest-full
pre-run:
- playbooks/workarounds/01-disable-unattended-upgrades.yaml
- playbooks/workarounds/02-install-linux-modules-extra-for-z3fold.yaml