From 5c876974db08dce0b34caea14176459dc2aa3e36 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 18 Jan 2013 16:30:59 -0800
Subject: [PATCH] Gate tempest on full tempest + postgres.

There was a change to have the test env decide if tempest should run all
of its tests instead of having devstack do this. This change made the
devstack postgres test run only the tempest smoketests when tempest was
being gated. Add a non voting postgres-full job that will run in the
tempest project's gate to change the test behavior back to what it was.

Change-Id: Ifaaef22437a2582ff7d8c3714d577ff42bb8db7d
Reviewed-on: https://review.openstack.org/20068
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Sean Dague <sdague@linux.vnet.ibm.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 .../config/devstack-gate.yaml                 | 38 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  |  8 +++-
 2 files changed, 44 insertions(+), 2 deletions(-)

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 4eabe63c3f..da517dc30d 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
@@ -495,6 +495,44 @@
       - devstack-complete
 
 
+- job:
+    name: gate-tempest-devstack-vm-postgres-full
+    node: devstack-precise
+
+    wrappers:
+      - timeout:
+          timeout: 180
+          fail: true
+      - timestamps
+
+    parameters:
+      - label:
+          name: NODE_LABEL
+          description: Label of node to use for this build
+          default: devstack-precise
+
+    triggers:
+      - zuul
+
+    builders:
+      - devstack-inprogress
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export DEVSTACK_GATE_POSTGRES=1
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+      - devstack-complete
+
+
 # Called by devstack jobs to alert that they have started so that the
 # jenkins slave they are running on can be disabled.
 - job:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 4dc431920a..56abfe089b 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -73,6 +73,9 @@ jobs:
   - name: gate-tempest-devstack-vm-postgres
     branch: ^(?!stable/(diablo|essex|folsom)).*$
     voting: false
+  - name: gate-tempest-devstack-vm-postgres-full
+    branch: ^(?!stable/(diablo|essex|folsom)).*$
+    voting: false
   - name: ^.*-python27$
     parameter-function: python27_params
   - name: gate-nova-pylint
@@ -719,18 +722,19 @@ projects:
     gate:
       - gate-tempest-devstack-vm
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-postgres-full
 
   - name: openstack/tempest
     check:
       - gate-tempest-pep8
       - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres
+      - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-quantum
     gate:
       - gate-tempest-pep8
       - gate-tempest-devstack-vm-full
-      - gate-tempest-devstack-vm-postgres
+      - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-quantum