Merge "Run identity v3 only job in heat"

jenkins/jobs/heat.yaml

@@ -153,7 +153,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-heat{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-heat{special}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -175,6 +175,9 @@
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
+          if [ "{special}" == "-identity-v3-only" ] ; then
+              export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
+          fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 

jenkins/jobs/projects.yaml

@@ -2418,11 +2418,18 @@
           branch-override: default
           engine: orig
           lbaasversion: lbaasv1
-      - '{pipeline}-tempest-dsvm-heat{job-suffix}':
+      - '{pipeline}-tempest-dsvm-heat{special}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
+          special: ''
           job-suffix: ''
           branch-override: default
+      - '{pipeline}-tempest-dsvm-heat{special}{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          special: '-identity-v3-only'
+          job-suffix: '-nv'
+          branch-override: default
       - '{pipeline}-tempest-dsvm-heat-apache{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty

zuul/layout.yaml

@@ -6974,6 +6974,7 @@ projects:
       - gate-tempest-dsvm-heat
       - gate-tempest-dsvm-heat-apache
       - gate-grenade-dsvm-heat
+      - gate-tempest-dsvm-heat-identity-v3-only-nv
     gate:
       - gate-heat-dsvm-functional-orig-mysql-lbaasv1
       - gate-heat-dsvm-functional-convg-mysql-lbaasv1