Enables job for heat convergence functional test

Adds check non-voting job for testing heat convergence
functionality

Change-Id: I394d50bb4d2d0c659a1711943ff9cc7d2bc1cb0a

jenkins/jobs/heat.yaml

@@ -54,7 +54,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-heat-dsvm-functional-{datastore}{branch-designator}'
+    name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -77,16 +77,20 @@
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
           export KEEP_LOCALRC=1
+
           if [ "{datastore}" == "postgres" ] ; then
               export DEVSTACK_GATE_POSTGRES=1
           fi
 
+          if [ "{engine}" == "convg" ] ; then
+              export ENABLE_CONVERGENCE=true
+          fi
+
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
 
-
           function pre_test_hook {{
               cd /opt/stack/new/heat/heat_integrationtests
               ./pre_test_hook.sh

jenkins/jobs/projects.yaml

@@ -252,18 +252,27 @@
 
     jobs:
       - python-jobs
-      - '{pipeline}-heat-dsvm-functional-{datastore}{branch-designator}':
+      - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{branch-designator}':
           datastore: mysql
           pipeline: check
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''
           branch-override: default
-      - '{pipeline}-heat-dsvm-functional-{datastore}{branch-designator}':
+          engine: orig
+      - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{branch-designator}':
           datastore: postgres
           pipeline: check
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''
           branch-override: default
+          engine: orig
+      - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{branch-designator}':
+          datastore: mysql
+          pipeline: check
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+          engine: convg
       - '{pipeline}-tempest-dsvm-heat{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-trusty'

zuul/layout.yaml

@@ -686,13 +686,17 @@ jobs:
   - name: check-tempest-dsvm-neutron-nv
     branch: ^feature/pecan
 
-  - name: check-heat-dsvm-functional-mysql
+  - name: check-heat-dsvm-functional-orig-mysql
     branch: ^(?!stable/(icehouse|juno)).*$
 
-  - name: check-heat-dsvm-functional-postgres
+  - name: check-heat-dsvm-functional-orig-postgres
     branch: ^(?!stable/icehouse).*$
     voting: false
 
+  - name: check-heat-dsvm-functional-convg-mysql
+    branch: ^(?!stable/(icehouse|juno|kilo)).*$
+    voting: false
+
     # Images for Icehouse do not contain python34
   - name: ^(gate|check)-.*-python34$
     branch: ^(?!stable/icehouse).*$
@@ -1791,12 +1795,12 @@ projects:
       - name: translation-jobs
       - name: experimental-tripleo-jobs
     check:
-      - check-heat-dsvm-functional-mysql
+      - check-heat-dsvm-functional-orig-mysql
       - check-tempest-dsvm-heat
       - gate-heat-python34
       - check-grenade-dsvm-heat
     gate:
-      - check-heat-dsvm-functional-mysql
+      - check-heat-dsvm-functional-orig-mysql
       - gate-tempest-dsvm-heat
     post:
       - heat-coverage
@@ -1804,7 +1808,8 @@ projects:
       - check-tripleo-ironic-overcloud-precise-nonha
     experimental:
       - gate-rally-dsvm-fakevirt-heat
-      - check-heat-dsvm-functional-postgres
+      - check-heat-dsvm-functional-orig-postgres
+      - check-heat-dsvm-functional-convg-mysql
 
   - name: openstack/heat-specs
     template: