From 1e20164c647d2c515b82e2b60b4b3a2bc2fa8377 Mon Sep 17 00:00:00 2001
From: Andrea Frittoli <andrea.frittoli@hp.com>
Date: Mon, 10 Mar 2014 12:03:02 +0000
Subject: [PATCH] Add experimental keystonev3 jobs

Add new job-templates:
- check-tempest-dsvm-keystonev3-full{branch-designator}
- check-tempest-dsvm-neutron-keystonev3-full{branch-designator}

Add the new jobs to experimental pipeline for tempest
triggered by check experimental

Partially implements bp keystone-v3-jobs

Change-Id: Ie2ebbe52d453a662cbcfb610afb81aeecd994059
---
 .../config/devstack-gate.yaml                 | 70 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  |  2 +
 2 files changed, 72 insertions(+)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index ffd21cb823..a0f9575247 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -815,6 +815,74 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 185
+          fail: true
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=180
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export DEVSTACK_GATE_KEYSTONE_V3=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          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
+
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 125
+          fail: true
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_TESTR_FULL=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
+          export DEVSTACK_GATE_KEYSTONE_V3=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          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
+
+
 - job-template:
     name: '{pipeline}-grenade-dsvm'
     node: '{node}'
@@ -1247,3 +1315,5 @@
       - '{pipeline}-tempest-dsvm-trove-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-full-non-isolated{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-full-non-isolated{branch-designator}'
+      - '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}'
+      - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index cc03bfbff1..a9a8fd287c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2154,6 +2154,8 @@ projects:
       - gate-tempest-dsvm-trove-full
       - check-tempest-dsvm-marconi
       - check-tempest-dsvm-virtual-ironic-nv
+      - check-tempest-dsvm-keystonev3-full
+      - check-tempest-dsvm-neutron-keystonev3-full
     experimental-tripleo:
       - check-tripleo-seed-precise
       - check-tripleo-ironic-seed-precise