Merge "Modifying devstack plugin job template"

jenkins/jobs/devstack-gate.yaml

@@ -1861,7 +1861,7 @@
 # A template for any project with a devstack-plugin to run the full
 # tempest suite with their project/plugin enabled.
 - job-template:
-    name: 'gate-tempest-dsvm-full-{plugin}'
+    name: '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}'
     node: 'devstack-precise || devstack-trusty'
 
     wrappers:

jenkins/jobs/projects.yaml

@@ -1943,9 +1943,16 @@
 
     jobs:
       - gate-{name}-bashate
-      - 'gate-tempest-dsvm-full-{plugin}':
+      - '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}':
+          pipeline: check
           plugin: glusterfs
           plugin-repo: stackforge/devstack-plugin-glusterfs
+          branch-designator: '-nv'
+      - '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}':
+          pipeline: check
+          plugin: glusterfs
+          plugin-repo: stackforge/devstack-plugin-glusterfs
+          branch-designator: ''
 
 - project:
     name: devstack-plugin-sheepdog
@@ -1953,9 +1960,11 @@
 
     jobs:
       - gate-{name}-bashate
-      - 'gate-tempest-dsvm-full-{plugin}':
+      - '{pipeline}-tempest-dsvm-full-{plugin}{branch-designator}':
+          pipeline: gate
           plugin: sheepdog
           plugin-repo: stackforge/devstack-plugin-sheepdog
+          branch-designator: ''
 
 - project:
     name: hacking

zuul/layout.yaml

@@ -920,8 +920,6 @@ jobs:
     voting: false
   - name: gate-tempest-dsvm-full-sheepdog
     voting: false
-  - name: gate-tempest-dsvm-full-glusterfs
-    voting: false
   - name: gate-tomograph-python34
     voting: false
   - name: gate-cliff-requirements
@@ -1161,7 +1159,7 @@ projects:
       - check-devstack-dsvm-cells
       - gate-rally-dsvm-cinder
       - check-tempest-dsvm-full-ceph
-      - gate-tempest-dsvm-full-glusterfs
+      - check-tempest-dsvm-full-glusterfs-nv
     gate:
       - gate-devstack-dsvm-cells
     experimental:
@@ -4665,7 +4663,7 @@ projects:
       - name: merge-check
     check:
       - gate-devstack-plugin-glusterfs-bashate
-      - gate-tempest-dsvm-full-glusterfs
+      - check-tempest-dsvm-full-glusterfs
     gate:
       - gate-devstack-plugin-glusterfs-bashate