Add grenade-dsvm-forward job template

The stable grenade job used to be a place holder for the fact
that folsom => grizzly upgrade never was quite working, so we
ran grenade on the grizzly gates in a non voting way.

This is now replaced with the "forward" job, which is landing
a new change on the old side of the tree, and attempting to
upgrade forward. A push up upgrade (instead of a pull up
upgrade).

Take over the stable job for these purposes, putting it in non
voting mode for now to ensure that we're working before we light
it.

Change-Id: Iee18bf97a42dab3cdbef3066446b540e77072d73

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

@@ -573,13 +573,13 @@
       - console-log
 
 
-- job:
+- job-template:
-    name: gate-grenade-dsvm-stable
+    name: '{pipeline}-grenade-dsvm-forward'
-    node: devstack-precise
+    node: '{node}'
 
     wrappers:
       - timeout:
-          timeout: 180
+          timeout: 60
           fail: true
       - timestamps
 
@@ -590,6 +590,7 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_GRENADE=1
+          export DEVSTACK_GATE_GRENADE_FORWARD=1
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
@@ -721,6 +722,7 @@
       - '{pipeline}-tempest-dsvm-neutron-heat-slow{branch-designator}'
       - '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}'
       - '{pipeline}-grenade-dsvm'
+      - '{pipeline}-grenade-dsvm-forward'
       - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-savanna-postgres-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}'

modules/openstack_project/files/zuul/layout.yaml

@@ -137,11 +137,9 @@ jobs:
     branch: ^(?!stable/grizzly).*$
     # only here until stable is votable, then merge
     # back to a single job
-  - name: gate-grenade-dsvm-stable
+  - name: ^(gate|check)-grenade-dsvm-forward$
-    branch: ^(stable/grizzly).*$
+    branch: ^(stable/).*$
     voting: false
-    # Remove when gate-grenade-dsvm-stable is
-    # merged into gate-grenade-dsvm
   - name: gate-grenade-noop
     branch: ^(stable/grizzly).*$
   - name: gate-devstack-bash8
@@ -687,7 +685,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
     post:
       - cinder-branch-tarball
@@ -735,7 +733,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
     post:
       - glance-branch-tarball
@@ -786,7 +784,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
     post:
       - horizon-branch-tarball
@@ -857,7 +855,7 @@ projects:
       - gate-grenade-dsvm
       - gate-swift-dsvm-functional
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
     post:
       - keystone-branch-tarball
@@ -908,7 +906,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-tempest-dsvm-neutron-full
     post:
       - nova-branch-tarball
@@ -1181,7 +1179,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
     post:
       - swift-branch-tarball
@@ -1283,7 +1281,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
     post:
       - python-cinderclient-branch-tarball
@@ -1325,7 +1323,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
     post:
       - python-glanceclient-branch-tarball
@@ -1367,7 +1365,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
     post:
       - python-keystoneclient-branch-tarball
@@ -1412,7 +1410,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
     post:
       - python-novaclient-branch-tarball
@@ -1489,7 +1487,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
     post:
       - python-neutronclient-branch-tarball
@@ -1574,11 +1572,11 @@ projects:
     check:
       - gate-grenade-noop
       - check-grenade-dsvm
+      - check-grenade-dsvm-forward
     gate:
       - gate-grenade-noop
       - gate-grenade-dsvm
-    experimental:
+      - gate-grenade-dsvm-forward
-      - gate-grenade-dsvm-stable
 
   - name: openstack-dev/cookiecutter
     check:
@@ -1675,6 +1673,7 @@ projects:
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - check-grenade-dsvm
+      - check-grenade-dsvm-forward
       - check-swift-dsvm-functional
     gate:
       - gate-devstack-bash8
@@ -1684,10 +1683,11 @@ projects:
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm
+      - gate-grenade-dsvm-forward
       - gate-swift-dsvm-functional
     experimental:
       - gate-tempest-dsvm-neutron-heat-slow
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
 
   - name: openstack-infra/elastic-recheck
@@ -1730,7 +1730,7 @@ projects:
       - gate-grenade-dsvm
       - gate-swift-dsvm-functional
     experimental:
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
 
   # This is not strictly necessary; there is currently a transitive
@@ -1777,7 +1777,7 @@ projects:
       - gate-grenade-dsvm
     experimental:
       - gate-tempest-dsvm-neutron-heat-slow
-      - gate-grenade-dsvm-stable
+      - gate-grenade-dsvm-forward
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-neutron-full
     post: