Add topology flag to Heat job template

At the time, Heat only has grenade singlenode gate job. This patch
set will add topology flag to Heat job template, so with just single
template we have 2 jobs (singlenode/multinode) for upgrade testing.

Partials-Implements: blueprint heat-rolling-upgrades
Change-Id: I1e00afa4ecd7ecdb4cc2a39620d54b69b68d124e

jenkins/jobs/heat.yaml

@@ -197,7 +197,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-heat-{node}{suffix}'
+    name: '{pipeline}-grenade-dsvm-heat{topology}-{node-release}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -219,32 +219,24 @@
           export PYTHONUNBUFFERED=true
           export GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat"
 
-          export ENABLED_SERVICES
-
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
           export DEVSTACK_GATE_GRENADE=pullup
           export BRANCH_OVERRIDE={branch-override}
+          export TOPOLOGY={topology}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
 
-          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
+          # Default topology is all-in-one (aio)
+          if [ "$TOPOLOGY" == "-multinode" ] ; then
+              export DEVSTACK_GATE_TOPOLOGY="multinode"
+          fi
 
           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
+      - console-log

jenkins/jobs/projects.yaml

@@ -5283,16 +5283,27 @@
           branch-override: default
           engine: convg
           lbaasversion: lbaasv2
-      - '{pipeline}-grenade-dsvm-heat-{node}{suffix}':
+      - '{pipeline}-grenade-dsvm-heat{topology}-{node-release}{suffix}':
           pipeline: gate
+          topology: ''
+          node-release: ubuntu-xenial
           node: ubuntu-xenial
           suffix: ''
           branch-override: default
-      - '{pipeline}-grenade-dsvm-heat-{node}{suffix}':
+      - '{pipeline}-grenade-dsvm-heat{topology}-{node-release}{suffix}':
           pipeline: gate
+          topology: ''
+          node-release: ubuntu-xenial
           node: ubuntu-xenial
           suffix: '-nv'
           branch-override: default
+      - '{pipeline}-grenade-dsvm-heat{topology}-{node-release}{suffix}':
+          pipeline: gate
+          topology: '-multinode'
+          node-release: ubuntu-xenial
+          node: ubuntu-xenial-2-node
+          suffix: '-nv'
+          branch-override: default
       - gate-rally-dsvm-fakevirt-{name}-{node}{suffix}:
           node: ubuntu-xenial
           suffix: '-nv'

zuul/layout.yaml

@@ -10355,6 +10355,7 @@ projects:
     experimental:
       - gate-rally-dsvm-fakevirt-heat-ubuntu-xenial-nv
       - gate-tripleo-ci-centos-7-nonha-multinode-oooq
+      - gate-grenade-dsvm-heat-multinode-ubuntu-xenial-nv
     experimental-tripleo:
       - gate-tripleo-ci-centos-7-ovb-nonha-convergence