From a9f9ce66742596f183aabf1e7aacc2ac7d965d3c Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Tue, 13 Jan 2015 16:22:14 -0500
Subject: [PATCH] split up pbr tests from requirements tests

pbr installation testing needs to know that all current package
definitions will actually work upon a pbr change, in the multiple ways
that packages need to be installed.

requirements testing needs to ensure that all the requirements work,
but don't need to check that 3 times on every tree. They also only
need to care that the global list is installable (not currently tested).

We should fork these tests and specialize the requirements test to
it's purpose. Especially as doing so should reduce the run time by
over 50%.

Depends-On: I37b1510f3639c332a13bd7fc892b66f71b99b594

Change-Id: Ia49d93031425ce70e7667972fdf9078143d0dd53
---
 jenkins/jobs/projects.yaml     |  6 ++++++
 jenkins/jobs/requirements.yaml | 34 ++++++++++++++++++++++++++++++++++
 zuul/layout.yaml               |  4 ++--
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index cba49bd490..c92b9a25dd 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1427,6 +1427,12 @@
       - '{pipeline}-requirements-integration-dsvm':
           pipeline: check
           node: 'devstack-precise || devstack-trusty'
+      - '{pipeline}-pbr-installation-dsvm':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+      - '{pipeline}-pbr-installation-dsvm':
+          pipeline: check
+          node: 'devstack-precise || devstack-trusty'
 
 - project:
     name: sahara-dashboard
diff --git a/jenkins/jobs/requirements.yaml b/jenkins/jobs/requirements.yaml
index 7a8e498583..263784f897 100644
--- a/jenkins/jobs/requirements.yaml
+++ b/jenkins/jobs/requirements.yaml
@@ -2,6 +2,40 @@
     name: '{pipeline}-requirements-integration-dsvm'
     node: '{node}'
 
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_REQS_INTEGRATION=1
+          export PIP_PROCESS_DEPENDENCY_LINKS=1
+          function gate_hook {{
+              set -x
+              bash $BASE/new/devstack-gate/devstack-vm-gate.sh && \
+              bash -xe $BASE/new/requirements/tools/integration.sh $(cat $BASE/new/requirements/projects.txt)
+          }}
+          export -f gate_hook
+          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}-pbr-installation-dsvm'
+    node: '{node}'
+
     wrappers:
       - build-timeout:
           timeout: 125
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bfb30e0319..db9ab03dbb 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3015,9 +3015,9 @@ projects:
       - name: pypy-jobs
       - name: experimental-tripleo-jobs
     check:
-      - check-requirements-integration-dsvm
+      - check-pbr-installation-dsvm
     gate:
-      - gate-requirements-integration-dsvm
+      - gate-pbr-installation-dsvm
     post:
       - pbr-coverage
     post: