From 450762f370ae5c13d1c3c808986a1e1defec0bf5 Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@redhat.com>
Date: Wed, 15 Jul 2015 15:58:58 -0400
Subject: [PATCH] Kolla: Add a gate for image-centos-binary

This builds centos in binary mode.  The tox job uses Kolla's
next generation build script which is not compatible with the
initial version of our build script.  As a result of this we
left the existing job intact so we maintain gating of our
image building process with our initial build script tool.

As part of the new gating with the new build, we are also gating an
entirely new Dockerfile infrastructure which is templated.  These
new dockerfiles are not compatible with the legacy build script.  As
a result we need the existing kolla-functional-f21 to remain intact
until we finish the build and dockerfile templated implementations.

After that we intend to remove the kolla-function-f21 gate job,
the legacy build script and the legacy dockerfiles.

Co-Authored-By: Steven Dake <stdake@cisco.com>

Change-Id: I2a3d42d34a32a2f514b8c64f17ff54e7b08d6d7b
---
 jenkins/jobs/kolla.yaml    | 22 ++++++++++++++++++++++
 jenkins/jobs/projects.yaml |  7 ++++++-
 zuul/layout.yaml           |  4 ++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/jenkins/jobs/kolla.yaml b/jenkins/jobs/kolla.yaml
index 53b35310e9..6a8e0c5df4 100644
--- a/jenkins/jobs/kolla.yaml
+++ b/jenkins/jobs/kolla.yaml
@@ -18,3 +18,25 @@
 
     publishers:
       - console-log
+
+
+- job-template:
+    name: '{pipeline}-kolla-build-images-{distro}-{type}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 60
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - gerrit-git-prep
+      - shell: |
+          #!/bin/bash -xe
+          tests/setup_gate.sh
+          tox -e images-{distro}-{type}
+
+    publishers:
+      - console-log
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index ef23a0aa55..fc12f198ba 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4951,8 +4951,13 @@
       - 'gate-{name}-tox-{envlist}':
           envlist: validate-contents
       - '{pipeline}-kolla-functional-f21':
-          pipeline: gate
           node: 'devstack-f21'
+          pipeline: gate
+      - '{pipeline}-kolla-build-images-{distro}-{type}':
+          distro: centos
+          node: 'devstack-f21'
+          pipeline: gate
+          type: binary
 
 - project:
     name: kwapi
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 76c460524f..8861d32428 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1411,6 +1411,9 @@ jobs:
   - name: gate-kolla-functional-f21
     voting: false
 
+  - name: gate-kolla-build-images-centos-binary
+    voting: false
+
   - name: ^(gate-)?devstack-publish-docs
     branch: ^master
 
@@ -7215,6 +7218,7 @@ projects:
       - gate-kolla-pep8
       - gate-kolla-tox-validate-contents
       - gate-kolla-functional-f21
+      - gate-kolla-build-images-centos-binary
     gate:
       - gate-kolla-bashate
       - gate-kolla-pep8