Merge "Fix job definition as devstack-plugin-ceph is branched" into stable/xena

.zuul.yaml

@@ -1,68 +1,3 @@
-- job:
-    name: devstack-plugin-ceph-tempest-base
-    abstract: true
-    parent: tempest-full
-    description: |
-      Base integration tests that runs with the ceph devstack plugin.
-      Former names for this job where:
-        * legacy-tempest-dsvm-full-devstack-plugin-ceph
-        * gate-tempest-dsvm-full-devstack-plugin-ceph-ubuntu-xenial
-      The original job included support for an un-used tempest-conf.sh:
-        # If an in-repo configuration exists, source it.  This will likely
-        # override DEVSTACK_GATE_TEMPEST_REGEX to further refine the set of
-        # tests being run.
-    required-projects:
-      - openstack/cinder-tempest-plugin
-      - openstack/devstack-plugin-ceph
-    irrelevant-files: &irrelevant-files
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^tox.ini$
-    timeout: 7200
-    vars:
-      devstack_plugins:
-        devstack-plugin-ceph: https://opendev.org/openstack/devstack-plugin-ceph
-      devstack_localrc:
-        ENABLE_FILE_INJECTION: false
-        TEMPEST_PLUGINS: '/opt/stack/cinder-tempest-plugin'
-        ENABLE_VOLUME_MULTIATTACH: false
-        TEMPEST_RUN_VALIDATION: false
-      tox_envlist: all
-      tempest_test_regex: |
-              (^tempest\.(api|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance)|(^cinder_tempest_plugin))
-      tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/devstack-plugin-ceph"].src_dir }}/tempest_skiplist.txt'
-
-- job:
-    name: devstack-plugin-ceph-tempest
-    parent: devstack-plugin-ceph-tempest-base
-    description: |
-      Integration tests that runs with the ceph devstack plugin and py27.
-    branches:
-      - stable/ocata
-      - stable/pike
-      - stable/queens
-      - stable/rocky
-    vars:
-      devstack_localrc:
-        CEPH_RELEASE: "luminous"
-
-- job:
-    name: devstack-plugin-ceph-tempest
-    parent: devstack-plugin-ceph-tempest-base
-    description: |
-      Integration tests that runs with the ceph devstack plugin and py27.
-
-      This job enable the multiattach feature enable from stein on.
-
-    # This job runs with multiattach enable from stable/stein on.
-    branches:
-      - stable/stein
-      - stable/train
-    vars:
-      devstack_localrc:
-        ENABLE_VOLUME_MULTIATTACH: true
-        CEPH_RELEASE: "nautilus"
-
 - job:
     name: devstack-plugin-ceph-tempest-py3-base
     abstract: true
@@ -77,7 +12,10 @@
     required-projects:
       - openstack/cinder-tempest-plugin
       - openstack/devstack-plugin-ceph
-    irrelevant-files: *irrelevant-files
+    irrelevant-files: &irrelevant-files
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^tox.ini$
     timeout: 7200
     vars:
       devstack_localrc:
@@ -92,20 +30,6 @@
               (^tempest\.(api|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance)|(^cinder_tempest_plugin))
       tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/devstack-plugin-ceph"].src_dir }}/tempest_skiplist.txt'
 
-- job:
-    name: devstack-plugin-ceph-tempest-py3
-    parent: devstack-plugin-ceph-tempest-py3-base
-    description: |
-      Integration tests that runs with the ceph devstack plugin and py3.
-    branches:
-      - stable/ocata
-      - stable/pike
-      - stable/queens
-      - stable/rocky
-    vars:
-      devstack_localrc:
-        CEPH_RELEASE: "luminous"
-
 - job:
     name: devstack-plugin-ceph-tempest-py3
     parent: devstack-plugin-ceph-tempest-py3-base
@@ -113,9 +37,6 @@
       Integration tests that runs with the ceph devstack plugin and py3.
 
       This job enable the multiattach feature enable from stein on.
-
-    # This job runs with multiattach enable from stable/stein on.
-    branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
     vars:
       devstack_localrc:
         ENABLE_VOLUME_MULTIATTACH: true
@@ -195,17 +116,6 @@
           REMOTE_CEPH: true
           CINDER_CEPH_UUID: d531d2d4-3937-429c-b0c2-658fe41e82aa
 
-- job:
-    name: devstack-plugin-ceph-master-tempest
-    parent: devstack-plugin-ceph-tempest-py3-base
-    description: |
-      Integration tests that runs with the ceph devstack plugin
-      using Ceph master as the backend.
-    branches: master
-    vars:
-      devstack_localrc:
-        TEST_MASTER: true
-
 - project-template:
     name: devstack-plugin-ceph-tempest-jobs
     description: |
@@ -221,8 +131,6 @@
             voting: false
         - devstack-plugin-ceph-tempest-fedora-latest
         - devstack-plugin-ceph-multinode-tempest-py3
-        - devstack-plugin-ceph-master-tempest:
-            voting: false
     gate:
       jobs:
         - devstack-plugin-ceph-tempest-py3