From 2e511e709e92a0bf3865656dcf0393717c60b234 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug.hellmann@dreamhost.com>
Date: Fri, 28 Mar 2014 07:23:18 -0700
Subject: [PATCH] Parameterize library cross-test job

Update the job for running the unit tests of one project with the master
HEAD from oslo.test so that both projects can be specified as parameters.

bp enhance-cross-test-gate-job

Change-Id: Ib13e0ff79f78bcfea6f975a0786ac667d4bb4168
---
 .../jenkins_job_builder/config/oslo.yaml      | 25 ++++++++++++++++---
 .../jenkins_job_builder/config/projects.yaml  | 23 ++---------------
 .../openstack_project/files/zuul/layout.yaml  | 14 ++++++++---
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml
index f7320f2d7c..47197e3127 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-oslo.test-dsvm-{name}{branch-designator}'
+    name: '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -16,14 +16,14 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=95
-          export PROJECTS="openstack/oslo.test $PROJECTS"
+          export PROJECTS="{injectedrepo} $PROJECTS"
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
 
           function gate_hook {{
-              cd /opt/stack/new/oslo.test
+              cd /opt/stack/new/$(basename {injectedrepo})
               remaining_time
               timeout -s 9 ${{REMAINING_TIME}}m ./tools/run_cross_tests.sh /opt/stack/new/{name} py27
           }}
@@ -44,3 +44,22 @@
     publishers:
       - devstack-logs
       - console-log
+
+
+- job-group:
+    name: oslotest-cross-test
+
+    injectedlib: oslotest
+    injectedrepo: openstack/oslo.test
+
+    jobs:
+      - '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
+          pipeline: check
+          node: 'devstack-precise || devstack-precise-check'
+          branch-designator: ''
+          branch-override: default
+      - '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
+          pipeline: gate
+          node: devstack-precise
+          branch-designator: ''
+          branch-override: default
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 3f8c6398e4..04a2b8bc5d 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -789,17 +789,7 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - '{pipeline}-oslo.test-dsvm-{name}{branch-designator}':
-          pipeline: check
-          node: 'devstack-precise || devstack-precise-check'
-          branch-designator: ''
-          branch-override: default
-      - '{pipeline}-oslo.test-dsvm-{name}{branch-designator}':
-          pipeline: gate
-          node: devstack-precise
-          branch-designator: ''
-          branch-override: default
-
+      - oslotest-cross-test
 
 - project:
     name: oslo.messaging
@@ -812,16 +802,7 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - '{pipeline}-oslo.test-dsvm-{name}{branch-designator}':
-          pipeline: check
-          node: 'devstack-precise || devstack-precise-check'
-          branch-designator: ''
-          branch-override: default
-      - '{pipeline}-oslo.test-dsvm-{name}{branch-designator}':
-          pipeline: gate
-          node: devstack-precise
-          branch-designator: ''
-          branch-override: default
+      - oslotest-cross-test
 
 - project:
     name: oslo.rootwrap
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 53a61c5bc9..40ca2f5fb4 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1808,11 +1808,11 @@ projects:
     check:
       - gate-oslo.config-python33
       - check-devstack-dsvm-cells
-      - check-oslo.test-dsvm-oslo.config
+      - check-oslotest-dsvm-oslo.config
     gate:
       - gate-oslo.config-python33
       - gate-devstack-dsvm-cells
-      - gate-oslo.test-dsvm-oslo.config
+      - gate-oslotest-dsvm-oslo.config
     pre-release:
       - oslo.config-tarball
     experimental-tripleo:
@@ -1838,12 +1838,12 @@ projects:
       - check-devstack-dsvm-cells
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-oslo.test-dsvm-oslo.messaging
+      - check-oslotest-dsvm-oslo.messaging
     gate:
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-oslo.test-dsvm-oslo.messaging
+      - gate-oslotest-dsvm-oslo.messaging
     experimental-tripleo:
       - check-tripleo-seed-precise
       - check-tripleo-ironic-seed-precise
@@ -1904,6 +1904,12 @@ projects:
       - name: pypy-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
+    check:
+      - check-oslotest-dsvm-oslo.config
+      - check-oslotest-dsvm-oslo.messaging
+    gate:
+      - gate-oslotest-dsvm-oslo.config
+      - gate-oslotest-dsvm-oslo.messaging
     pre-release:
       - oslo.test-tarball
     release: