Merge "Check changes using devstack-tobiko-storage-ceph job"

zuul.d/devstack-tobiko-ceph.yaml

@@ -1,34 +0,0 @@
----
-
-- project-template:
-    name: devstack-tobiko-ceph
-    description: |
-      DevStack jobs intended to gate Ceph project changes
-    check:
-      jobs:
-        - devstack-tobiko-ceph
-    periodic:
-      jobs:
-        - devstack-tobiko-ceph
-
-
-# --- STANDALONE -------------------------------------------------------------
-
-- job:
-    name: devstack-tobiko-ceph
-    parent: devstack-tobiko-storage
-    required-projects:
-      - openstack/devstack-plugin-ceph
-    voting: false
-    vars:
-      devstack_plugins:
-        devstack-plugin-ceph:
-          https://opendev.org/openstack/devstack-plugin-ceph.git
-      devstack_localrc:
-        ENABLE_CEPH_CINDER: true     # ceph backend for cinder
-        ENABLE_CEPH_GLANCE: true     # store images in ceph
-        ENABLE_CEPH_C_BAK: true      # backup volumes to ceph
-        ENABLE_CEPH_NOVA: true       # allow nova to use ceph resources
-        ENABLE_FILE_INJECTION: false
-        ENABLE_VOLUME_MULTIATTACH: false
-      test_workflow: create-resources

zuul.d/devstack-tobiko-storage.yaml

@@ -1,30 +1,53 @@
 ---
 
+# --- PROJECT TEMPLATES ------------------------------------------------------
+
 - project-template:
-    name: devstack-tobiko-glance
+    name: devstack-tobiko-ceph
     description: |
-      Legacy template name for devstack-tobiko-storage jobs
+      Place-holder for old template name
 
 
 - project-template:
     name: devstack-tobiko-storage
     description: |
       DevStack jobs intended to gate Glance project changes
-    check:
+    check: &CHECK
-      jobs:
-        - devstack-tobiko-storage
-    periodic:
       jobs:
         - devstack-tobiko-storage
+        - devstack-tobiko-storage-ceph
+    periodic: *CHECK
 
 
-# --- STANDALONE -------------------------------------------------------------
+# --- JOBS -------------------------------------------------------------------
 
 - job:
     name: devstack-tobiko-storage
     parent: devstack-tobiko-minimal
     required-projects:
       - openstack/glance
-    voting: false
+    voting: true
     vars:
       test_workflow: create-resources
+
+
+- job:
+    name: devstack-tobiko-storage-ceph
+    parent: devstack-tobiko-storage
+    description: |
+      DevStack job intended to gate Ceph project changes
+    required-projects:
+      - openstack/devstack-plugin-ceph
+    voting: true
+    vars:
+      devstack_plugins:
+        devstack-plugin-ceph:
+          https://opendev.org/openstack/devstack-plugin-ceph.git
+      devstack_localrc:
+        ENABLE_CEPH_CINDER: true     # ceph backend for cinder
+        ENABLE_CEPH_GLANCE: true     # store images in ceph
+        ENABLE_CEPH_C_BAK: true      # backup volumes to ceph
+        ENABLE_CEPH_NOVA: true       # allow nova to use ceph resources
+        ENABLE_FILE_INJECTION: false
+        ENABLE_VOLUME_MULTIATTACH: false
+      test_workflow: create-resources

zuul.d/project.yaml

@@ -5,7 +5,6 @@
       - ansible-role-jobs
       - devstack-tobiko
       - devstack-tobiko-centos
-      - devstack-tobiko-ceph
       - devstack-tobiko-fedora
       - devstack-tobiko-functional
       - devstack-tobiko-heat