From cb4f2f330e20dc529fe4ab8c326a9acc11fe4074 Mon Sep 17 00:00:00 2001
From: Raildo Mascena <raildo@lsd.ufcg.edu.br>
Date: Fri, 6 May 2016 11:53:41 -0300
Subject: [PATCH] Run novaclient functional tests in Identity v3-only

Creates a new job that runs nova functional tests in a
identity v3-only devstack, and adds this job to the novaclient
pipeline.

Change-Id: I7c1aa379cd88b7ca5b9af47506f9fdb56978f82f
---
 jenkins/jobs/nova.yaml     | 5 ++++-
 jenkins/jobs/projects.yaml | 9 ++++++++-
 zuul/layout.yaml           | 4 ++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/jenkins/jobs/nova.yaml b/jenkins/jobs/nova.yaml
index e94809484b..eaaa4411a3 100644
--- a/jenkins/jobs/nova.yaml
+++ b/jenkins/jobs/nova.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-novaclient-dsvm-functional{job-suffix}'
+    name: '{pipeline}-novaclient-dsvm-functional{special}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -25,6 +25,9 @@
               # Configure and run functional tests
               $BASE/new/python-novaclient/novaclient/tests/functional/hooks/post_test_hook.sh
           }}
+          if [ "{special}" == "-identity-v3-only" ] ; then
+              export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
+          fi
           export -f post_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index cc46a89ee7..3278be874c 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -7893,11 +7893,18 @@
       - translation-jobs
       - openstack-releasenotes-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-novaclient-dsvm-functional{job-suffix}':
+      - '{pipeline}-novaclient-dsvm-functional{special}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
+          special: ''
           job-suffix: ''
           branch-override: default
+      - '{pipeline}-novaclient-dsvm-functional{special}{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          special: '-identity-v3-only'
+          job-suffix: '-nv'
+          branch-override: default
 
 - project:
     name: python-oneviewclient
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3de5618518..b2bf52e005 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1621,6 +1621,9 @@ jobs:
           - ^tox.ini$
     voting: false
 
+  - name: ^gate-.*-identity-v3-only.*
+    branch: ^(?!stable/(liberty|mitaka)).*$
+
   - name: gate-tempest-dsvm-nova-libvirt-kvm-apr
     branch: ^(?!stable/(kilo|liberty|mitaka)).*$
     voting: false
@@ -10718,6 +10721,7 @@ projects:
       - name: release-notes-jobs
     check:
       - gate-novaclient-dsvm-functional
+      - gate-novaclient-dsvm-functional-identity-v3-only-nv
     gate:
       - gate-novaclient-dsvm-functional
     post: