From d22f50adfb1f2237565f6b0e4b51e53f6399fc5e Mon Sep 17 00:00:00 2001
From: Henrique Truta <henrique@lsd.ufcg.edu.br>
Date: Fri, 29 Apr 2016 11:23:10 -0500
Subject: [PATCH] Run keystone functional tests v3 only

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

Change-Id: I587ce0b0b4c3f07b34d22360830a603be70937f3
---
 jenkins/jobs/keystone.yaml | 33 +++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml |  5 +++++
 zuul/layout.yaml           |  4 ++++
 3 files changed, 42 insertions(+)

diff --git a/jenkins/jobs/keystone.yaml b/jenkins/jobs/keystone.yaml
index 6d34a3a079..6a478634c2 100644
--- a/jenkins/jobs/keystone.yaml
+++ b/jenkins/jobs/keystone.yaml
@@ -30,6 +30,39 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-keystone-dsvm-functional-v3-only{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 70
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
+          export DEVSTACK_GATE_TEMPEST_REGEX='keystone'
+          export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
+
+          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}-keystoneclient-dsvm-functional{job-suffix}'
     node: '{node}'
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 01f996c2b3..41ddfbd7a9 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2776,6 +2776,11 @@
           job-suffix: '-nv'
           branch-override: default
           node: ubuntu-trusty
+      - '{pipeline}-keystone-dsvm-functional-v3-only{job-suffix}':
+          pipeline: gate
+          job-suffix: '-nv'
+          branch-override: default
+          node: ubuntu-trusty
       - periodic-python-jobs-with-oslo-master
       - 'gate-{name}-tox-{envlist}':
           envlist: patch_cover
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c0c5975d66..1aa3a51b2e 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1972,6 +1972,9 @@ jobs:
   - name: gate-keystone-dsvm-functional-nv
     branch: ^(?!stable/(kilo|liberty|mitaka)).*$
 
+  - name: gate-keystone-dsvm-functional-v3-only-nv
+    branch: ^(?!stable/(kilo|liberty|mitaka)).*$
+
   - name: check-osc-plugins
     branch: ^(?!stable/(kilo|liberty)).*$
     voting: false
@@ -6862,6 +6865,7 @@ projects:
       - gate-keystone-tox-bandit
       - gate-keystone-tox-db-legacy_drivers
       - gate-keystone-dsvm-functional-nv
+      - gate-keystone-dsvm-functional-v3-only-nv
       - gate-tempest-dsvm-keystone-eventlet-full
       - gate-tempest-dsvm-keystone-uwsgi-full-nv
       - keystone-coverage-db