From 662bf145203f9458d21596ce665e4c274d0a946e Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 10 Feb 2016 22:42:26 +0000
Subject: [PATCH] Templatize experimental bindep jobs

The experimental bindep-using nova Python 2.7 unit test job is built
from a job-template now, updated for parity with the current state
of its traditional non-bindep equivalent, instantiated for nova via
a job-group, and added in the zuul layout with a project-template.
This is a preparatory step toward adding more bindep-based job types
and on a broader number of projects before we plan to cut over
official jobs to new non-bare/minimal DIB-based nodes.

Change-Id: I4d5c96d02c3d06c71f32cb3bea8ae3dde699a86b
Signed-off-by: Jeremy Stanley <fungi@yuggoth.org>
---
 jenkins/jobs/experimental-workers.yaml | 14 +++++++++++---
 jenkins/jobs/projects.yaml             |  1 +
 zuul/layout.yaml                       |  6 +++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/jenkins/jobs/experimental-workers.yaml b/jenkins/jobs/experimental-workers.yaml
index 86cd59d84d..bc6d4192b7 100644
--- a/jenkins/jobs/experimental-workers.yaml
+++ b/jenkins/jobs/experimental-workers.yaml
@@ -1,5 +1,5 @@
-- job:
-    name: bindep-nova-python27
+- job-template:
+    name: gate-{name}-python27-bindep
 
     wrappers:
       - build-timeout:
@@ -7,7 +7,9 @@
       - timestamps
 
     builders:
-      - zuul-git-prep-upper-constraints
+      - print-template-name:
+          template-name: "{template-name}"
+      - gerrit-git-prep
       - install-distro-packages
       - mysql-prep
       - pgsql-prep
@@ -22,5 +24,11 @@
     publishers:
       - test-results
       - console-log
+      - zuul-swift-test-results-with-console
 
     node: ubuntu-trusty
+
+- job-group:
+    name: experimental-bindep-jobs
+    jobs:
+      - gate-{name}-python27-bindep
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 0501d847e4..97d8c31547 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3737,6 +3737,7 @@
       - translation-jobs-liberty
       - openstack-releasenotes-jobs
       - periodic-python-jobs-with-oslo-master
+      - experimental-bindep-jobs
 
 - project:
     name: nova-docker
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 859a9350d3..f2024a768b 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -679,6 +679,10 @@ project-templates:
       - gate-tripleo-ci-f22-nonha
       - gate-tripleo-ci-f22-containers
 
+  - name: experimental-bindep-jobs
+    experimental:
+      - gate-nova-python27-bindep
+
   - name: experimental-tripleo-jobs
     experimental-tripleo:
       - gate-tripleo-ci-f22-nonha
@@ -7041,6 +7045,7 @@ projects:
       - name: large-ops
       - name: translation-jobs
       - name: translation-jobs-liberty
+      - name: experimental-bindep-jobs
       - name: experimental-tripleo-jobs
       - name: release-notes-jobs
     check:
@@ -7069,7 +7074,6 @@ projects:
       - gate-tempest-dsvm-nova-wsgi-full
       - gate-tempest-dsvm-neutron-multinode-full
       - gate-tempest-dsvm-neutron-dvr-multinode-full
-      - bindep-nova-python27
       - gate-tempest-dsvm-ironic-pxe_ipa-full-nv
       - gate-tempest-dsvm-lxc
       - gate-tempest-dsvm-neutron-src-oslo.versionedobjects