From 84397fd254289a5f877edea8ec4bb95ca967e406 Mon Sep 17 00:00:00 2001
From: Matt Borland <matt.borland@hpe.com>
Date: Fri, 29 Jul 2016 15:33:38 -0600
Subject: [PATCH] Splitting current/deprecated integ. test

Horizon now is interested in having two integration tests: 1) current
2) deprecated panels.

This patch changes the integration job into a job-template and configures
Horizon to use both the current/deprecated jobs.  The job-template
passes the 'type' parameter into the pre-test hook so it can differentiate
and configure the test environment appropriately.

Change-Id: I1f2028c18d6d9933a986a9bc47750e1b5fdca708
Partially-Implements: blueprint test-deprecated-features
---
 jenkins/jobs/horizon.yaml  | 22 +++++++++++++++-------
 jenkins/jobs/projects.yaml |  1 +
 zuul/layout.yaml           |  8 +++++---
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/jenkins/jobs/horizon.yaml b/jenkins/jobs/horizon.yaml
index e6385f81a2..5ee8dfe496 100644
--- a/jenkins/jobs/horizon.yaml
+++ b/jenkins/jobs/horizon.yaml
@@ -1,5 +1,5 @@
-- job:
-    name: gate-horizon-dsvm-integration
+- job-template:
+    name: 'gate-horizon-dsvm-integration-{testtype}'
     node: ubuntu-trusty
 
     wrappers:
@@ -22,16 +22,16 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_SETTINGS=/opt/stack/new/horizon/tools/gate/integration/devstack_gate_rc
 
-          function pre_test_hook {
+          function pre_test_hook {{
               cd /opt/stack/new/horizon/tools/gate/integration
-              ./pre_test_hook.sh
-          }
+              ./pre_test_hook.sh '{testtype}'
+          }}
           export -f pre_test_hook
 
-          function post_test_hook {
+          function post_test_hook {{
               cd /opt/stack/new/horizon/tools/gate/integration
               ./post_test_hook.sh
-          }
+          }}
           export -f post_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
@@ -54,6 +54,14 @@
               keep-hierarchy: true
               copy-after-failure: true
 
+- job-group:
+    name: 'horizon-dsvm-integration-jobs'
+    jobs:
+      - 'gate-horizon-dsvm-integration-{testtype}':
+          testtype: 'current'
+      - 'gate-horizon-dsvm-integration-{testtype}':
+          testtype: 'deprecated'
+
 - job:
     name: gate-horizon-selenium-headless
     node: ubuntu-trusty
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 59645165bf..a596e0f7c9 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3155,6 +3155,7 @@
       - translation-jobs
       - translation-jobs-mitaka
       - nodejs4-jobs
+      - horizon-dsvm-integration-jobs
       - 'gate-{name}-python35{suffix}':
           suffix: '-nv'
       - 'gate-{name}-tox-{envlist}-{node}':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f4ef927052..216f8de03a 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2690,7 +2690,7 @@ jobs:
   - name: gate-horizon-selenium-headless
     branch: ^(?!stable/liberty).*$
 
-  - name: gate-horizon-dsvm-integration
+  - name: ^gate-horizon-dsvm-integration-.*$
     branch: ^(?!stable/liberty).*$
 
   # TODO(kragniz): Enable voting for each driver when the jobs are
@@ -7791,17 +7791,19 @@ projects:
       - gate-horizon-tox-py27dj19-ubuntu-xenial
       - gate-horizon-tox-py27dj110-ubuntu-trusty
       - gate-horizon-tox-py27dj110-ubuntu-xenial
-      - gate-horizon-dsvm-integration
       - gate-horizon-selenium-headless
       - gate-horizon-dsvm-tempest-plugin
+      - gate-horizon-dsvm-integration-current
+      - gate-horizon-dsvm-integration-deprecated
     gate:
       - gate-horizon-tox-py27dj18-ubuntu-trusty
       - gate-horizon-tox-py27dj18-ubuntu-xenial
       - gate-horizon-tox-py27dj19-ubuntu-trusty
       - gate-horizon-tox-py27dj19-ubuntu-xenial
-      - gate-horizon-dsvm-integration
       - gate-horizon-selenium-headless
       - gate-horizon-dsvm-tempest-plugin
+      - gate-horizon-dsvm-integration-current
+      - gate-horizon-dsvm-integration-deprecated
     post:
       - horizon-coverage-ubuntu-trusty
       - horizon-coverage-ubuntu-xenial