From 350984a0a82d1a6c117bd9d34bab9603375f8581 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Thu, 12 Jun 2014 23:43:44 -0400
Subject: [PATCH] Add tempest jobs with nova-v3 enabled

This commit adds a dedicated job to the experimental pipeline for nova
and tempest. It also adds the v3 api job to the set of qa-periodic
jobs. This depends on devstack-gate change:
I0e4fd5a1f1cde138af08f1cf9bf4b9e80c241e81

Change-Id: Iae4788048f2a97667f027bfc2872d51c94ca240b
---
 .../config/devstack-gate.yaml                 | 35 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  |  5 +++
 2 files changed, 40 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 3363a088bf..8ff2efdd59 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
@@ -850,6 +850,40 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-nova-v3-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_FULL=1
+          export DEVSTACK_GATE_TEMPEST_NOVA_V3_API=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export OVERRIDE_TEMPEST_PROJECT_BRANCH=master
+          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-postgres-zeromq-full{branch-designator}'
     node: '{node}'
@@ -1334,3 +1368,4 @@
       - '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-full-apache-services{branch-designator}'
+      - '{pipeline}-tempest-dsvm-nova-v3-full{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 58dff95587..6ddfceba0c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -433,6 +433,8 @@ jobs:
     voting: false
   - name: ^(gate|check)-tempest-dsvm-cells-full$
     voting: false
+  - name: ^(gate|check)-tempest-dsvm-nova-v3-full$
+    branch: ^(?!stable/havana).*$
   - name: ^(gate|check)-grenade-dsvm$
     branch: ^(?!stable/havana).*$
   - name: ^(gate|check)-grenade-dsvm-neutron$
@@ -1053,6 +1055,7 @@ projects:
       - gate-grenade-dsvm-forward
       - check-tempest-dsvm-cells-full
       - check-tempest-dsvm-neutron-pg
+      - check-tempest-dsvm-nova-v3-full
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
       - check-tripleo-undercloud-precise
@@ -2141,6 +2144,7 @@ projects:
       - check-tempest-dsvm-marconi
       - check-tempest-dsvm-keystonev3-full
       - check-tempest-dsvm-neutron-keystonev3-full
+      - check-tempest-dsvm-nova-v3-full
       # havana compat jobs for tempest master (non voting)
       - check-tempest-master-dsvm-full-havana
       - check-tempest-master-dsvm-neutron-havana
@@ -2166,6 +2170,7 @@ projects:
       - periodic-tempest-dsvm-neutron-full-non-isolated-master
       - periodic-tempest-dsvm-all-master
       - periodic-tempest-dsvm-stress-master
+      - periodic-tempest-dsvm-nova-v3-full-master
 
   - name: openstack/tripleo-heat-templates
     template: