Make the Heat grenade job voting

The grenade job for Heat has been passing for more than a
week now. Make it voting.

Also, move out grenade job from devstack-gate and into
Heat. Add extra branch designator for non-voting grenade
job and add that non-voting job to the grenade project.

Change-Id: I53b7a36cd7e3b184acabeaa22c858e395630f567

jenkins/jobs/devstack-gate.yaml

@@ -1711,53 +1711,6 @@
       - console-log
 
 
-- job-template:
-    name: '{pipeline}-grenade-dsvm-heat{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 130
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,q-vpn,quantum,rabbit,s-account,s-container,s-object,s-proxy,q-lbaas,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api
-          export DEVSTACK_GATE_TIMEOUT=120
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_GRENADE=pullup
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat"
-
-          function pre_test_hook {{
-              cd /opt/stack/new/heat/heat_upgradetests
-              ./pre_test_hook.sh
-          }}
-          export -f pre_test_hook
-
-          function post_test_hook {{
-              cd /opt/stack/new/heat/heat_upgradetests
-              ./post_test_hook.sh
-          }}
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
 - job-template:
     name: '{pipeline}-tempest-dsvm-all{branch-designator}'
     node: '{node}'
@@ -2452,7 +2405,6 @@
       - '{pipeline}-grenade-dsvm-partial-ironic{branch-designator}'
       - '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}'
       - '{pipeline}-grenade-dsvm-ceilometer{branch-designator}'
-      - '{pipeline}-grenade-dsvm-heat{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic-agent_ssh{branch-designator}'

jenkins/jobs/heat.yaml

@@ -180,3 +180,50 @@
      - test-results
      - devstack-logs
      - console-log
+
+
+- job-template:
+    name: '{pipeline}-grenade-dsvm-heat{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,q-vpn,quantum,rabbit,s-account,s-container,s-object,s-proxy,q-lbaas,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_GRENADE=pullup
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat"
+
+          function pre_test_hook {{
+              cd /opt/stack/new/heat/heat_upgradetests
+              ./pre_test_hook.sh
+          }}
+          export -f pre_test_hook
+
+          function post_test_hook {{
+              cd /opt/stack/new/heat/heat_upgradetests
+              ./post_test_hook.sh
+          }}
+          export -f post_test_hook
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log

jenkins/jobs/projects.yaml

@@ -340,6 +340,16 @@
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''
           branch-override: default
+      - '{pipeline}-grenade-dsvm-heat{branch-designator}':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+      - '{pipeline}-grenade-dsvm-heat{branch-designator}':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: '-nv'
+          branch-override: default
       - python-juno-bitrot-jobs
       - python-kilo-bitrot-jobs
       - openstack-publish-jobs

zuul/layout.yaml

@@ -776,7 +776,6 @@ jobs:
 
   - name: ^gate-grenade-dsvm-heat
     branch: ^(?!stable/(juno|kilo)).*$
-    voting: false
 
   - name: gate-devstack-dsvm-updown
     branch: ^(?!stable)
@@ -1959,6 +1958,7 @@ projects:
     gate:
       - gate-heat-dsvm-functional-orig-mysql
       - gate-tempest-dsvm-heat
+      - gate-grenade-dsvm-heat
     post:
       - heat-coverage
     check-tripleo:
@@ -4911,7 +4911,7 @@ projects:
       - gate-grenade-dsvm-neutron
       - gate-grenade-dsvm-partial-ncpu
       - gate-grenade-dsvm-ironic-sideways
-      - gate-grenade-dsvm-heat
+      - gate-grenade-dsvm-heat-nv
     gate:
       - gate-grenade-dsvm
       - gate-grenade-dsvm-forward