Merge "Create two classes of d-g jobs."

modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml

@@ -1,6 +1,6 @@
 - job-template:
-    name: 'check-tempest-devstack-vm-full-stable-{release}'
-    node: devstack-precise || devstack-precise-check
+    name: 'periodic-tempest-devstack-vm-full-{branch-designator}'
+    node: '{node}'
 
     wrappers:
       - timeout:
@@ -15,172 +15,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
-- job-template:
-    name: 'check-tempest-devstack-vm-neutron-stable-{release}'
-    node: devstack-precise || devstack-precise-check
-
-    wrappers:
-      - timeout:
-          timeout: 60
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_SMOKE_SERIAL=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
-- job-template:
-    name: 'check-devstack-vm-cells-stable-{release}'
-    node: devstack-precise || devstack-precise-check
-
-    wrappers:
-      - timeout:
-          timeout: 60
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_CELLS=1
-          export DEVSTACK_GATE_EXERCISES=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
-- job-template:
-    name: 'check-tempest-devstack-vm-cells-stable-{release}'
-    node: devstack-precise || devstack-precise-check
-
-    wrappers:
-      - timeout:
-          timeout: 60
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_CELLS=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
-- job-template:
-    name: 'check-tempest-devstack-vm-cells-full-stable-{release}'
-    node: devstack-precise || devstack-precise-check
-
-    wrappers:
-      - timeout:
-          timeout: 90
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_CELLS=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
-- job-template:
-    name: 'check-tempest-devstack-vm-postgres-full-stable-{release}'
-    node: devstack-precise || devstack-precise-check
-
-    wrappers:
-      - timeout:
-          timeout: 90
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_POSTGRES=1
-          export ZUUL_BRANCH=stable/{release}
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
-- job-template:
-    name: 'periodic-tempest-devstack-vm-full-stable-{release}'
-    node: devstack-precise
-
-    wrappers:
-      - timeout:
-          timeout: 90
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export ZUUL_BRANCH=stable/{release}
+          export ZUUL_BRANCH={branch-override}
           unset ZUUL_PROJECT
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
@@ -194,8 +29,8 @@
 
 
 - job-template:
-    name: 'periodic-tempest-devstack-vm-postgres-full-stable-{release}'
-    node: devstack-precise
+    name: 'periodic-tempest-devstack-vm-postgres-full-{branch-designator}'
+    node: '{node}'
 
     wrappers:
       - timeout:
@@ -211,7 +46,7 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_POSTGRES=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
-          export ZUUL_BRANCH=stable/{release}
+          export ZUUL_BRANCH={branch-override}
           unset ZUUL_PROJECT
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
@@ -225,8 +60,8 @@
 
 
 - job-template:
-    name: 'periodic-tempest-devstack-vm-neutron-stable-{release}'
-    node: devstack-precise
+    name: 'periodic-tempest-devstack-vm-neutron-{branch-designator}'
+    node: '{node}'
 
     wrappers:
       - timeout:
@@ -242,7 +77,7 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_SMOKE_SERIAL=1
-          export ZUUL_BRANCH=stable/{release}
+          export ZUUL_BRANCH={branch-override}
           unset ZUUL_PROJECT
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
@@ -256,8 +91,8 @@
 
 
 - job-template:
-    name: 'periodic-tempest-devstack-vm-all-stable-{release}'
-    node: devstack-precise
+    name: 'periodic-tempest-devstack-vm-all-{branch-designator}'
+    node: '{node}'
 
     wrappers:
       - timeout:
@@ -272,7 +107,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_ALL=1
-          export ZUUL_BRANCH=stable/{release}
+          export ZUUL_BRANCH={branch-override}
           unset ZUUL_PROJECT
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
@@ -286,8 +121,8 @@
 
 
 - job-template:
-    name: 'periodic-tempest-devstack-vm-coverage-stable-{release}'
-    node: devstack-precise
+    name: 'periodic-tempest-devstack-vm-coverage-{branch-designator}'
+    node: '{node}'
 
     wrappers:
       - timeout:
@@ -302,7 +137,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_COVERAGE=1
-          export ZUUL_BRANCH=stable/{release}
+          export ZUUL_BRANCH={branch-override}
           unset ZUUL_PROJECT
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
@@ -316,8 +151,8 @@
 
 
 - job-template:
-    name: 'periodic-tempest-devstack-vm-stress-stable-{release}'
-    node: devstack-precise
+    name: 'periodic-tempest-devstack-vm-stress-{branch-designator}'
+    node: '{node}'
 
     wrappers:
       - timeout:
@@ -332,7 +167,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_STRESS=1
-          export ZUUL_BRANCH=stable/{release}
+          export ZUUL_BRANCH={branch-override}
           unset ZUUL_PROJECT
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
@@ -346,8 +181,8 @@
 
 
 - job-template:
-    name: 'periodic-tempest-devstack-vm-neutron-pg-stable-{release}'
-    node: devstack-precise
+    name: 'periodic-tempest-devstack-vm-neutron-pg-{branch-designator}'
+    node: '{node}'
 
     wrappers:
       - timeout:
@@ -364,7 +199,7 @@
           export DEVSTACK_GATE_POSTGRES=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_SMOKE_SERIAL=1
-          export ZUUL_BRANCH=stable/{release}
+          export ZUUL_BRANCH={branch-override}
           unset ZUUL_PROJECT
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
@@ -378,8 +213,8 @@
 
 
 - job-template:
-    name: 'periodic-tempest-devstack-vm-large-ops-stable-{release}'
-    node: devstack-precise
+    name: 'periodic-tempest-devstack-vm-large-ops-{branch-designator}'
+    node: '{node}'
 
     wrappers:
       - timeout:
@@ -394,7 +229,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1
-          export ZUUL_BRANCH=stable/{release}
+          export ZUUL_BRANCH={branch-override}
           unset ZUUL_PROJECT
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
@@ -408,8 +243,8 @@
 
 
 - job-template:
-    name: 'periodic-tempest-devstack-vm-neutron-large-ops-stable-{release}'
-    node: devstack-precise
+    name: 'periodic-tempest-devstack-vm-neutron-large-ops-{branch-designator}'
+    node: '{node}'
 
     wrappers:
       - timeout:
@@ -425,7 +260,97 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1
           export DEVSTACK_GATE_NEUTRON=1
-          export ZUUL_BRANCH=stable/{release}
+          export ZUUL_BRANCH={branch-override}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-qa@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-all-{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 180
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_ALL=1
+          export ZUUL_BRANCH={branch-override}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-qa@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-coverage-{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 180
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_COVERAGE=1
+          export ZUUL_BRANCH={branch-override}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-qa@lists.openstack.org
+
+
+- job-template:
+    name: 'periodic-tempest-devstack-vm-stress-{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 180
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_STRESS=1
+          export ZUUL_BRANCH={branch-override}
           unset ZUUL_PROJECT
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
@@ -439,25 +364,17 @@
 
 
 - job-group:
-    name: devstack-stable-check-jobs
+    name: devstack-periodic-jobs
     jobs:
-      - 'check-tempest-devstack-vm-full-stable-{release}'
-      - 'check-tempest-devstack-vm-neutron-stable-{release}'
-      - 'check-devstack-vm-cells-stable-{release}'
-      - 'check-tempest-devstack-vm-cells-stable-{release}'
-      - 'check-tempest-devstack-vm-cells-full-stable-{release}'
-      - 'check-tempest-devstack-vm-postgres-full-stable-{release}'
-
-
-- job-group:
-    name: devstack-stable-periodic-jobs
-    jobs:
-      - 'periodic-tempest-devstack-vm-full-stable-{release}'
-      - 'periodic-tempest-devstack-vm-postgres-full-stable-{release}'
-      - 'periodic-tempest-devstack-vm-neutron-stable-{release}'
-      - 'periodic-tempest-devstack-vm-all-stable-{release}'
-      - 'periodic-tempest-devstack-vm-coverage-stable-{release}'
-      - 'periodic-tempest-devstack-vm-stress-stable-{release}'
-      - 'periodic-tempest-devstack-vm-neutron-pg-stable-{release}'
-      - 'periodic-tempest-devstack-vm-large-ops-stable-{release}'
-      - 'periodic-tempest-devstack-vm-neutron-large-ops-stable-{release}'
+      - 'periodic-tempest-devstack-vm-full-{branch-designator}'
+      - 'periodic-tempest-devstack-vm-postgres-full-{branch-designator}'
+      - 'periodic-tempest-devstack-vm-neutron-{branch-designator}'
+      - 'periodic-tempest-devstack-vm-all-{branch-designator}'
+      - 'periodic-tempest-devstack-vm-coverage-{branch-designator}'
+      - 'periodic-tempest-devstack-vm-stress-{branch-designator}'
+      - 'periodic-tempest-devstack-vm-neutron-pg-{branch-designator}'
+      - 'periodic-tempest-devstack-vm-large-ops-{branch-designator}'
+      - 'periodic-tempest-devstack-vm-neutron-large-ops-{branch-designator}'
+      - 'periodic-tempest-devstack-vm-all-{branch-designator}'
+      - 'periodic-tempest-devstack-vm-coverage-{branch-designator}'
+      - 'periodic-tempest-devstack-vm-stress-{branch-designator}'

modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-full'
+    name: '{pipeline}-tempest-devstack-vm-full-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -15,6 +15,10 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -24,93 +28,9 @@
       - console-log
 
 
-- job:
-    name: gate-tempest-devstack-vm-iad-trial
-    node: devstack-precise-iad
-
-    wrappers:
-      - timeout:
-          timeout: 180
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export ZUUL_BRANCH=master
-          unset ZUUL_PROJECT
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-
-
-- job:
-    name: gate-tempest-devstack-vm-dfw-trial
-    node: devstack-precise-dfw
-
-    wrappers:
-      - timeout:
-          timeout: 180
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export ZUUL_BRANCH=master
-          unset ZUUL_PROJECT
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-
-
-- job:
-    name: gate-tempest-devstack-vm-ord-trial
-    node: devstack-precise-ord
-
-    wrappers:
-      - timeout:
-          timeout: 180
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export ZUUL_BRANCH=master
-          unset ZUUL_PROJECT
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-
-
-- job:
-    name: gate-tempest-devstack-vm-heat-slow
-    node: devstack-precise
+- job-template:
+    name: '{pipeline}-tempest-devstack-vm-heat-slow-{branch-designator}'
+    node: '{node}'
 
     wrappers:
       - timeout:
@@ -125,6 +45,10 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_HEAT_SLOW=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -135,7 +59,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-neutron'
+    name: '{pipeline}-tempest-devstack-vm-neutron-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -152,6 +76,10 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_SMOKE_SERIAL=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -162,7 +90,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-neutron-pg'
+    name: '{pipeline}-tempest-devstack-vm-neutron-pg-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -180,6 +108,10 @@
           export DEVSTACK_GATE_POSTGRES=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_SMOKE_SERIAL=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -190,7 +122,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-neutron-isolated'
+    name: '{pipeline}-tempest-devstack-vm-neutron-isolated-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -208,6 +140,10 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
           export DEVSTACK_GATE_SMOKE_SERIAL=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -218,7 +154,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-neutron-isolated-parallel'
+    name: '{pipeline}-tempest-devstack-vm-neutron-isolated-parallel-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -235,6 +171,10 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -244,7 +184,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-neutron-pg-isolated'
+    name: '{pipeline}-tempest-devstack-vm-neutron-pg-isolated-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -263,6 +203,10 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
           export DEVSTACK_GATE_SMOKE_SERIAL=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -273,7 +217,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-neutron-full'
+    name: '{pipeline}-tempest-devstack-vm-neutron-full-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -291,6 +235,10 @@
           export DEVSTACK_GATE_TEMPEST_TESTR_FULL=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -301,7 +249,7 @@
 
 
 - job-template:
-    name: '{pipeline}-devstack-vm-cells'
+    name: '{pipeline}-devstack-vm-cells-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -317,6 +265,10 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_CELLS=1
           export DEVSTACK_GATE_EXERCISES=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -327,7 +279,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-cells'
+    name: '{pipeline}-tempest-devstack-vm-cells-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -343,6 +295,10 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_CELLS=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -353,7 +309,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-cells-full'
+    name: '{pipeline}-tempest-devstack-vm-cells-full-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -370,6 +326,10 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
           export DEVSTACK_GATE_CELLS=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -380,7 +340,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-large-ops'
+    name: '{pipeline}-tempest-devstack-vm-large-ops-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -396,6 +356,10 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -405,7 +369,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-neutron-large-ops'
+    name: '{pipeline}-tempest-devstack-vm-neutron-large-ops-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -422,6 +386,10 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1
           export DEVSTACK_GATE_NEUTRON=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -431,99 +399,9 @@
       - console-log
 
 
-- job:
-    name: periodic-tempest-devstack-vm-all
-    node: devstack-precise
-
-    wrappers:
-      - timeout:
-          timeout: 180
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_ALL=1
-          export ZUUL_BRANCH=master
-          unset ZUUL_PROJECT
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-      - email:
-          recipients: openstack-qa@lists.openstack.org
-
-
-- job:
-    name: periodic-tempest-devstack-vm-coverage
-    node: devstack-precise
-
-    wrappers:
-      - timeout:
-          timeout: 180
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_COVERAGE=1
-          export ZUUL_BRANCH=master
-          unset ZUUL_PROJECT
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-      - email:
-          recipients: openstack-qa@lists.openstack.org
-
-
-- job:
-    name: periodic-tempest-devstack-vm-stress
-    node: devstack-precise
-
-    wrappers:
-      - timeout:
-          timeout: 180
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_STRESS=1
-          export ZUUL_BRANCH=master
-          unset ZUUL_PROJECT
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-      - email:
-          recipients: openstack-qa@lists.openstack.org
-
-
-- job:
-    name: gate-tempest-devstack-vm-postgres-zeromq-full
-    node: devstack-precise
+- job-template:
+    name: '{pipeline}-tempest-devstack-vm-postgres-zeromq-full-{branch-designator}'
+    node: '{node}'
 
     wrappers:
       - timeout:
@@ -540,6 +418,10 @@
           export DEVSTACK_GATE_TEMPEST_FULL=1
           export DEVSTACK_GATE_POSTGRES=1
           export DEVSTACK_GATE_ZEROMQ=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -550,7 +432,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-postgres'
+    name: '{pipeline}-tempest-devstack-vm-postgres-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -566,6 +448,10 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_POSTGRES=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -576,7 +462,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-devstack-vm-postgres-full'
+    name: '{pipeline}-tempest-devstack-vm-postgres-full-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -593,6 +479,10 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_FULL=1
           export DEVSTACK_GATE_POSTGRES=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -657,18 +547,20 @@
 - job-group:
     name: devstack-jobs
     jobs:
-      - '{pipeline}-tempest-devstack-vm-full'
-      - '{pipeline}-tempest-devstack-vm-neutron'
-      - '{pipeline}-tempest-devstack-vm-neutron-pg'
-      - '{pipeline}-tempest-devstack-vm-neutron-isolated'
-      - '{pipeline}-tempest-devstack-vm-neutron-isolated-parallel'
-      - '{pipeline}-tempest-devstack-vm-neutron-pg-isolated'
-      - '{pipeline}-tempest-devstack-vm-neutron-full'
-      - '{pipeline}-devstack-vm-cells'
-      - '{pipeline}-tempest-devstack-vm-cells'
-      - '{pipeline}-tempest-devstack-vm-cells-full'
-      - '{pipeline}-tempest-devstack-vm-large-ops'
-      - '{pipeline}-tempest-devstack-vm-neutron-large-ops'
-      - '{pipeline}-tempest-devstack-vm-postgres'
-      - '{pipeline}-tempest-devstack-vm-postgres-full'
+      - '{pipeline}-tempest-devstack-vm-full-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-neutron-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-neutron-pg-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-neutron-isolated-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-neutron-isolated-parallel-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-neutron-pg-isolated-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-neutron-full-{branch-designator}'
+      - '{pipeline}-devstack-vm-cells-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-cells-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-cells-full-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-large-ops-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-neutron-large-ops-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-postgres-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-postgres-full-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-heat-slow-{branch-designator}'
+      - '{pipeline}-tempest-devstack-vm-postgres-zeromq-full-{branch-designator}'
       - '{pipeline}-grenade-devstack-vm'

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -981,15 +981,20 @@
     jobs:
       - python-jobs
       - openstack-publish-jobs
-      - '{pipeline}-swift-devstack-vm-functional':
+      - '{pipeline}-swift-devstack-vm-functional-{branch-designator}':
           pipeline: gate
           node: devstack-precise
-      - '{pipeline}-swift-devstack-vm-functional':
+          branch-designator: default
+          branch-override: default
+      - '{pipeline}-swift-devstack-vm-functional-{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-precise-check'
-      - 'periodic-swift-devstack-vm-functional-stable-{release}':
-          release: havana
+          branch-designator: default
+          branch-override: default
+      - 'periodic-swift-devstack-vm-functional-{branch-designator}':
           node: 'devstack-precise || devstack-precise-check'
+          branch-designator: stable-havana
+          branch-override: stable/havana
 # No one is interested in stable/ branches on swift, so don't run bitrot jobs
 
 
@@ -1010,20 +1015,41 @@
     name: devstack-jobs
 
     jobs:
+      # Normal gate and check jobs
       - devstack-jobs:
           pipeline: gate
           node: devstack-precise
+          branch-designator: default
+          branch-override: default
       - devstack-jobs:
           pipeline: check
           node: 'devstack-precise || devstack-precise-check'
-      - devstack-stable-check-jobs:
-          release:
-            - grizzly
-            - havana
-      - devstack-stable-periodic-jobs:
-          release:
-            - grizzly
-            - havana
+          branch-designator: default
+          branch-override: default
+      # Stable check jobs for testing devstack gate
+      - devstack-jobs:
+          pipeline: check
+          node: 'devstack-precise || devstack-precise-check'
+          branch-designator: stable-grizzly
+          branch-override: stable/grizzly
+      - devstack-jobs:
+          pipeline: check
+          node: 'devstack-precise || devstack-precise-check'
+          branch-designator: stable-havana
+          branch-override: stable/havana
+      # Periodic jobs for various branches
+      - devstack-periodic-jobs:
+          branch-designator: stable-grizzly
+          branch-override: stable/grizzly
+          node: devstack-precise
+      - devstack-periodic-jobs:
+          branch-designator: stable-havana
+          branch-override: stable/havana
+          node: devstack-precise
+      - devstack-periodic-jobs:
+          branch-designator: master
+          branch-override: master
+          node: devstack-precise
 
 
 - project:

modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-swift-devstack-vm-functional'
+    name: '{pipeline}-swift-devstack-vm-functional-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -15,6 +15,10 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
 
           function post_test_hook {{
               cd /opt/stack/new/swift
@@ -34,7 +38,7 @@
 
 
 - job-template:
-    name: 'periodic-swift-devstack-vm-functional-stable-{release}'
+    name: 'periodic-swift-devstack-vm-functional-{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -50,7 +54,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
-          export ZUUL_BRANCH=stable/{release}
+          export ZUUL_BRANCH={branch-override}
           unset ZUUL_PROJECT
 
           function post_test_hook {{

modules/openstack_project/files/zuul/layout.yaml

@@ -109,27 +109,27 @@ jobs:
     parameter-function: set_log_url
   - name: ^.*devstack-vm.*$
     parameter-function: single_use_node
-  - name: ^(gate|check)-tempest-devstack-vm-neutron-pg$
+  - name: ^(gate|check)-tempest-devstack-vm-neutron-pg-default$
     branch: ^(?!stable/grizzly).*$
-  - name: ^(gate|check)-tempest-devstack-vm-neutron-isolated$
+  - name: ^(gate|check)-tempest-devstack-vm-neutron-isolated-default$
     branch: ^(?!stable/grizzly).*$
-  - name: ^(gate|check)-tempest-devstack-vm-neutron-pg-isolated$
+  - name: ^(gate|check)-tempest-devstack-vm-neutron-pg-isolated-default$
     branch: ^(?!stable/grizzly).*$
-  - name: ^(gate|check)-tempest-devstack-vm-neutron-full$
+  - name: ^(gate|check)-tempest-devstack-vm-neutron-full-default$
     branch: ^(?!stable/grizzly).*$
     voting: false
-  - name: gate-tempest-devstack-vm-heat-slow
+  - name: gate-tempest-devstack-vm-heat-slow-default
     branch: ^(?!stable/grizzly).*$
     voting: false
-  - name: ^(gate|check)-devstack-vm-cells$
+  - name: ^(gate|check)-devstack-vm-cells-default$
     voting: false
-  - name: ^(gate|check)-tempest-devstack-vm-large-ops$
+  - name: ^(gate|check)-tempest-devstack-vm-large-ops-default$
     branch: ^(?!stable/grizzly).*$
-  - name: ^(gate|check)-tempest-devstack-vm-neutron-large-ops$
+  - name: ^(gate|check)-tempest-devstack-vm-neutron-large-ops-default$
     branch: ^(?!stable/grizzly).*$
-  - name: ^(gate|check)-tempest-devstack-vm-cells$
+  - name: ^(gate|check)-tempest-devstack-vm-cells-default$
     voting: false
-  - name: ^(gate|check)-tempest-devstack-vm-cells-full$
+  - name: ^(gate|check)-tempest-devstack-vm-cells-full-default$
     voting: false
   - name: ^(gate|check)-grenade-devstack-vm$
     branch: ^(?!stable/grizzly).*$
@@ -615,11 +615,11 @@ projects:
       - gate-cinder-python26
       - gate-cinder-python27
       - gate-cinder-pylint
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-cinder-requirements
@@ -627,15 +627,15 @@ projects:
       - gate-cinder-pep8
       - gate-cinder-python26
       - gate-cinder-python27
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - cinder-branch-tarball
       - cinder-coverage
@@ -663,11 +663,11 @@ projects:
       - gate-glance-docs
       - gate-glance-python26
       - gate-glance-python27
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-glance-requirements
@@ -675,15 +675,15 @@ projects:
       - gate-glance-pep8
       - gate-glance-python26
       - gate-glance-python27
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - glance-branch-tarball
       - glance-coverage
@@ -712,11 +712,11 @@ projects:
       - gate-horizon-python27
       - gate-horizon-python27-django14
       - gate-horizon-selenium
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-horizon-requirements
@@ -726,15 +726,15 @@ projects:
       - gate-horizon-python27
       - gate-horizon-python27-django14
       - gate-horizon-selenium
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - horizon-branch-tarball
       - horizon-coverage
@@ -783,29 +783,29 @@ projects:
       - gate-keystone-docs
       - gate-keystone-python26
       - gate-keystone-python27
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
-      - check-swift-devstack-vm-functional
+      - check-swift-devstack-vm-functional-default
     gate:
       - gate-keystone-requirements
       - gate-keystone-docs
       - gate-keystone-pep8
       - gate-keystone-python26
       - gate-keystone-python27
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
-      - gate-swift-devstack-vm-functional
+      - gate-swift-devstack-vm-functional-default
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - keystone-branch-tarball
       - keystone-coverage
@@ -834,13 +834,13 @@ projects:
       - gate-nova-docs
       - gate-nova-python26
       - gate-nova-python27
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
       - gate-nova-pylint
     gate:
       - gate-nova-requirements
@@ -848,16 +848,16 @@ projects:
       - gate-nova-pep8
       - gate-nova-python26
       - gate-nova-python27
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-tempest-devstack-vm-neutron-full
-      - periodic-tempest-devstack-vm-coverage
+      - gate-tempest-devstack-vm-neutron-full-default
+      - periodic-tempest-devstack-vm-coverage-master
     post:
       - nova-branch-tarball
       - nova-coverage
@@ -912,10 +912,10 @@ projects:
       - gate-oslo.config-python26
       - gate-oslo.config-python27
       - gate-oslo.config-python33
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-oslo.config-requirements
@@ -924,10 +924,10 @@ projects:
       - gate-oslo.config-python26
       - gate-oslo.config-python27
       - gate-oslo.config-python33
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     post:
       - oslo.config-branch-tarball
@@ -949,10 +949,10 @@ projects:
       - gate-oslo.messaging-docs
       - gate-oslo.messaging-python26
       - gate-oslo.messaging-python27
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-oslo.messaging-requirements
@@ -960,10 +960,10 @@ projects:
       - gate-oslo.messaging-pep8
       - gate-oslo.messaging-python26
       - gate-oslo.messaging-python27
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     post:
       - oslo.messaging-branch-tarball
@@ -1029,8 +1029,8 @@ projects:
       - gate-oslo.version-python27
       - gate-oslo.version-pypy
       - gate-oslo.version-python33
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-neutron
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-neutron-default
       - check-grenade-devstack-vm
     gate:
       - gate-oslo.version-requirements
@@ -1040,8 +1040,8 @@ projects:
       - gate-oslo.version-python27
       - gate-oslo.version-pypy
       - gate-oslo.version-python33
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-neutron
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-neutron-default
       - gate-grenade-devstack-vm
     post:
       - oslo.version-branch-tarball
@@ -1062,25 +1062,25 @@ projects:
       - gate-neutron-docs
       - gate-neutron-python26
       - gate-neutron-python27
-      - check-tempest-devstack-vm-neutron
-      - check-tempest-devstack-vm-neutron-pg
-      - check-tempest-devstack-vm-neutron-isolated
-      - check-tempest-devstack-vm-neutron-pg-isolated
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-neutron-default
+      - check-tempest-devstack-vm-neutron-pg-default
+      - check-tempest-devstack-vm-neutron-isolated-default
+      - check-tempest-devstack-vm-neutron-pg-isolated-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
     gate:
       - gate-neutron-requirements
       - gate-neutron-docs
       - gate-neutron-pep8
       - gate-neutron-python26
       - gate-neutron-python27
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-neutron-pg
-      - gate-tempest-devstack-vm-neutron-isolated
-      - gate-tempest-devstack-vm-neutron-pg-isolated
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-neutron-pg-default
+      - gate-tempest-devstack-vm-neutron-isolated-default
+      - gate-tempest-devstack-vm-neutron-pg-isolated-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
     experimental:
-      - gate-tempest-devstack-vm-neutron-full
-      - check-tempest-devstack-vm-neutron-isolated-parallel 
+      - gate-tempest-devstack-vm-neutron-full-default
+      - check-tempest-devstack-vm-neutron-isolated-parallel-default
     post:
       - neutron-branch-tarball
       - neutron-coverage
@@ -1108,12 +1108,12 @@ projects:
       - gate-swift-docs
       - gate-swift-python26
       - gate-swift-python27
-      - check-swift-devstack-vm-functional
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-neutron
-      - check-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-swift-devstack-vm-functional-default
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-swift-requirements
@@ -1121,16 +1121,16 @@ projects:
       - gate-swift-pep8
       - gate-swift-python26
       - gate-swift-python27
-      - gate-swift-devstack-vm-functional
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-swift-devstack-vm-functional-default
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - swift-branch-tarball
       - swift-coverage
@@ -1161,11 +1161,11 @@ projects:
       - gate-python-ceilometerclient-python27
       - gate-python-ceilometerclient-python33
       - gate-python-ceilometerclient-pypy
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
     gate:
       - gate-python-ceilometerclient-requirements
       - gate-python-ceilometerclient-docs
@@ -1173,11 +1173,11 @@ projects:
       - gate-python-ceilometerclient-python26
       - gate-python-ceilometerclient-python27
       - gate-python-ceilometerclient-pypy
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
     post:
       - python-ceilometerclient-branch-tarball
       - python-ceilometerclient-coverage
@@ -1200,11 +1200,11 @@ projects:
       - gate-python-cinderclient-python27
       - gate-python-cinderclient-python33
       - gate-python-cinderclient-pypy
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-python-cinderclient-requirements
@@ -1214,15 +1214,15 @@ projects:
       - gate-python-cinderclient-python27
       - gate-python-cinderclient-python33
       - gate-python-cinderclient-pypy
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - python-cinderclient-branch-tarball
       - python-cinderclient-coverage
@@ -1244,11 +1244,11 @@ projects:
       - gate-python-glanceclient-python26
       - gate-python-glanceclient-python27
       - gate-python-glanceclient-python33
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-python-glanceclient-requirements
@@ -1256,15 +1256,15 @@ projects:
       - gate-python-glanceclient-pep8
       - gate-python-glanceclient-python26
       - gate-python-glanceclient-python27
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - python-glanceclient-branch-tarball
       - python-glanceclient-coverage
@@ -1286,11 +1286,11 @@ projects:
       - gate-python-keystoneclient-python26
       - gate-python-keystoneclient-python27
       - gate-python-keystoneclient-python33
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-python-keystoneclient-requirements
@@ -1298,15 +1298,15 @@ projects:
       - gate-python-keystoneclient-pep8
       - gate-python-keystoneclient-python26
       - gate-python-keystoneclient-python27
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - python-keystoneclient-branch-tarball
       - python-keystoneclient-coverage
@@ -1329,11 +1329,11 @@ projects:
       - gate-python-novaclient-python27
       - gate-python-novaclient-python33
       - gate-python-novaclient-pypy
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-python-novaclient-requirements
@@ -1343,15 +1343,15 @@ projects:
       - gate-python-novaclient-python27
       - gate-python-novaclient-python33
       - gate-python-novaclient-pypy
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - python-novaclient-branch-tarball
       - python-novaclient-coverage
@@ -1401,14 +1401,14 @@ projects:
       - gate-python-neutronclient-python27
       - gate-python-neutronclient-python33
       - gate-python-neutronclient-pypy
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - check-tempest-devstack-vm-neutron-pg
-      - check-tempest-devstack-vm-neutron-isolated
-      - check-tempest-devstack-vm-neutron-pg-isolated
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - check-tempest-devstack-vm-neutron-pg-default
+      - check-tempest-devstack-vm-neutron-isolated-default
+      - check-tempest-devstack-vm-neutron-pg-isolated-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-python-neutronclient-requirements
@@ -1417,18 +1417,18 @@ projects:
       - gate-python-neutronclient-python26
       - gate-python-neutronclient-python27
       - gate-python-neutronclient-pypy
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-neutron-pg
-      - gate-tempest-devstack-vm-neutron-isolated
-      - gate-tempest-devstack-vm-neutron-pg-isolated
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-neutron-pg-default
+      - gate-tempest-devstack-vm-neutron-isolated-default
+      - gate-tempest-devstack-vm-neutron-pg-isolated-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - python-neutronclient-branch-tarball
       - python-neutronclient-coverage
@@ -1451,7 +1451,7 @@ projects:
       - gate-python-swiftclient-python27
       - gate-python-swiftclient-python33
       - gate-python-swiftclient-pypy
-      - check-swift-devstack-vm-functional
+      - check-swift-devstack-vm-functional-default
     gate:
       - gate-python-swiftclient-requirements
       - gate-python-swiftclient-docs
@@ -1459,7 +1459,7 @@ projects:
       - gate-python-swiftclient-python26
       - gate-python-swiftclient-python27
       - gate-python-swiftclient-pypy
-      - gate-swift-devstack-vm-functional
+      - gate-swift-devstack-vm-functional-default
     post:
       - python-swiftclient-branch-tarball
       - python-swiftclient-coverage
@@ -1479,25 +1479,25 @@ projects:
       - gate-requirements-python27
       - gate-requirements-pypy
       - check-requirements-integration
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
-      - check-swift-devstack-vm-functional
+      - check-swift-devstack-vm-functional-default
     gate:
       - gate-requirements-pep8
       - gate-requirements-python27
       - gate-requirements-pypy
       - gate-requirements-integration
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
-      - gate-swift-devstack-vm-functional
+      - gate-swift-devstack-vm-functional-default
     post:
       - post-mirror-python26
       - post-mirror-python27
@@ -1564,13 +1564,13 @@ projects:
       - gate-pbr-python33
       - gate-pbr-pypy
       - check-requirements-integration
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
-      - check-swift-devstack-vm-functional
+      - check-swift-devstack-vm-functional-default
     gate:
       - gate-pbr-docs
       - gate-pbr-pep8
@@ -1579,15 +1579,15 @@ projects:
       - gate-pbr-python33
       - gate-pbr-pypy
       - gate-requirements-integration
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
-      - gate-swift-devstack-vm-functional
+      - gate-swift-devstack-vm-functional-default
     experimental:
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - pbr-branch-tarball
       - pbr-coverage
@@ -1606,26 +1606,26 @@ projects:
   - name: openstack-dev/devstack
     check:
       - gate-devstack-bash8
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
-      - check-swift-devstack-vm-functional
+      - check-swift-devstack-vm-functional-default
     gate:
       - gate-devstack-bash8
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
-      - gate-swift-devstack-vm-functional
+      - gate-swift-devstack-vm-functional-default
     experimental:
-      - gate-tempest-devstack-vm-heat-slow
+      - gate-tempest-devstack-vm-heat-slow-default
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
 
   - name: openstack-infra/elastic-recheck
     check:
@@ -1637,13 +1637,13 @@ projects:
 
   - name: openstack-infra/devstack-gate
     check:
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
-      - check-swift-devstack-vm-functional
+      - check-swift-devstack-vm-functional-default
       - check-tempest-devstack-vm-full-stable-grizzly
       - check-tempest-devstack-vm-neutron-stable-grizzly
       - check-tempest-devstack-vm-postgres-full-stable-grizzly
@@ -1657,16 +1657,16 @@ projects:
       - check-tempest-devstack-vm-cells-stable-havana
       - check-tempest-devstack-vm-cells-full-stable-havana
     gate:
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
-      - gate-swift-devstack-vm-functional
+      - gate-swift-devstack-vm-functional-default
     experimental:
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
 
   # This is not strictly necessary; there is currently a transitive
   # relationship between g-t-devstack-vm,
@@ -1681,11 +1681,11 @@ projects:
 
   - name: z/tempest
     gate:
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron-full
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-full-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
 
   - name: openstack/tempest
     check:
@@ -1693,29 +1693,29 @@ projects:
       - gate-tempest-pep8
       - gate-tempest-docs
       - gate-tempest-python27
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - check-grenade-devstack-vm
     gate:
       - gate-tempest-requirements
       - gate-tempest-pep8
       - gate-tempest-docs
       - gate-tempest-python27
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
       - gate-grenade-devstack-vm
     experimental:
-      - gate-tempest-devstack-vm-heat-slow
+      - gate-tempest-devstack-vm-heat-slow-default
       - gate-grenade-devstack-vm-stable
-      - gate-devstack-vm-cells
-      - gate-tempest-devstack-vm-neutron-full
-      - periodic-tempest-devstack-vm-coverage
+      - gate-devstack-vm-cells-default
+      - gate-tempest-devstack-vm-neutron-full-default
+      - periodic-tempest-devstack-vm-coverage-master
     post:
       - tempest-docs
       - tempest-branch-tarball
@@ -1740,24 +1740,24 @@ projects:
       - gate-ceilometer-docs
       - gate-ceilometer-python26
       - gate-ceilometer-python27
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
-      - check-swift-devstack-vm-functional
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
+      - check-swift-devstack-vm-functional-default
     gate:
       - gate-ceilometer-requirements
       - gate-ceilometer-docs
       - gate-ceilometer-pep8
       - gate-ceilometer-python26
       - gate-ceilometer-python27
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
-      - gate-swift-devstack-vm-functional
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
+      - gate-swift-devstack-vm-functional-default
     post:
       - ceilometer-branch-tarball
       - ceilometer-coverage
@@ -1866,24 +1866,24 @@ projects:
       - gate-heat-docs
       - gate-heat-python26
       - gate-heat-python27
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
     gate:
       - gate-heat-requirements
       - gate-heat-pep8
       - gate-heat-docs
       - gate-heat-python26
       - gate-heat-python27
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
     experimental:
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - heat-branch-tarball
       - heat-coverage
@@ -1912,24 +1912,24 @@ projects:
       - gate-python-heatclient-python27
       - gate-python-heatclient-python33
       - gate-python-heatclient-pypy
-      - check-tempest-devstack-vm-full
-      - check-tempest-devstack-vm-postgres-full
-      - check-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - check-tempest-devstack-vm-full-default
+      - check-tempest-devstack-vm-postgres-full-default
+      - check-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
     gate:
       - gate-python-heatclient-requirements
       - gate-python-heatclient-pep8
       - gate-python-heatclient-python26
       - gate-python-heatclient-python27
       - gate-python-heatclient-pypy
-      - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres-full
-      - gate-tempest-devstack-vm-neutron
-      - gate-tempest-devstack-vm-large-ops
-      - gate-tempest-devstack-vm-neutron-large-ops
+      - gate-tempest-devstack-vm-full-default
+      - gate-tempest-devstack-vm-postgres-full-default
+      - gate-tempest-devstack-vm-neutron-default
+      - gate-tempest-devstack-vm-large-ops-default
+      - gate-tempest-devstack-vm-neutron-large-ops-default
     experimental:
-      - gate-devstack-vm-cells
+      - gate-devstack-vm-cells-default
     post:
       - python-heatclient-branch-tarball
       - python-heatclient-coverage