enable gating on grenade

create a new gate-grenade-devstack-vm-stable for stable trees, as
grenade is not yet working on stable.

turn on voting in check and gate for grenade in master, as we seem
to be only catching legitimate upgrade failures now.

Part of bp:upgrade-testing-in-gate

Change-Id: Ic5776b58d3f660d782111665ae1744574bc5a484

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

@@ -719,6 +719,39 @@
       - console-log
       - devstack-complete
 
+- job:
+    name: gate-grenade-devstack-vm-stable
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 180
+          fail: true
+      - timestamps
+
+    parameters:
+      - label:
+          name: NODE_LABEL
+          description: Label of node to use for this build
+          default: devstack-precise
+
+    builders:
+      - devstack-inprogress
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_GRENADE=1
+          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
+      - devstack-complete
+
 
 # Called by devstack jobs to alert that they have started so that the
 # jenkins slave they are running on can be disabled.

modules/openstack_project/files/zuul/layout.yaml

@@ -88,7 +88,12 @@ jobs:
     branch: ^(?!stable/folsom).*$
     voting: false
   - name: gate-grenade-devstack-vm
-    branch: ^(?!stable/folsom).*$
+    branch: ^(?!stable/(folsom|grizzly)).*$
+    voting: true
+    # only here until stable is votable, then merge
+    # back to a single job
+  - name: gate-grenade-devstack-vm-stable
+    branch: ^(stable/grizzly).*$
     voting: false
   - name: gate-tempest-docs
     branch: ^(?!stable/(folsom|grizzly)).*$
@@ -419,6 +424,7 @@ projects:
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-cinder-requirements
       - gate-cinder-docs
@@ -457,6 +463,7 @@ projects:
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-glance-requirements
       - gate-glance-docs
@@ -496,6 +503,7 @@ projects:
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-horizon-requirements
       - gate-horizon-docs
@@ -560,6 +568,7 @@ projects:
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-keystone-requirements
       - gate-keystone-docs
@@ -600,6 +609,7 @@ projects:
       - gate-tempest-devstack-vm-neutron
       - gate-tempest-devstack-vm-neutron-full
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
       - gate-nova-pylint
     gate:
       - gate-nova-requirements
@@ -753,6 +763,7 @@ projects:
       - gate-tempest-devstack-vm-neutron
       - gate-tempest-devstack-vm-postgres-full
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-swift-requirements
       - gate-swift-docs
@@ -815,6 +826,7 @@ projects:
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-python-cinderclient-requirements
       - gate-python-cinderclient-docs
@@ -854,6 +866,7 @@ projects:
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-python-glanceclient-requirements
       - gate-python-glanceclient-docs
@@ -893,6 +906,7 @@ projects:
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-python-keystoneclient-requirements
       - gate-python-keystoneclient-docs
@@ -932,6 +946,7 @@ projects:
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-python-novaclient-requirements
       - gate-python-novaclient-docs
@@ -996,6 +1011,7 @@ projects:
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-python-neutronclient-requirements
       - gate-python-neutronclient-docs
@@ -1058,9 +1074,11 @@ projects:
     check:
       - gate-noop
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-noop
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
 
   - name: openstack-dev/hacking
     check:
@@ -1140,6 +1158,7 @@ projects:
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
@@ -1158,6 +1177,7 @@ projects:
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
@@ -1198,6 +1218,7 @@ projects:
       - gate-tempest-devstack-vm-neutron
       - gate-tempest-devstack-vm-neutron-full
       - gate-grenade-devstack-vm
+      - gate-grenade-devstack-vm-stable
     gate:
       - gate-tempest-requirements
       - gate-tempest-pep8