From 70a69f57ba3d372e09462180f7e2a2aecd001206 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Mon, 22 Jul 2013 17:27:44 -0700
Subject: [PATCH] Wait for inprogress jobs to complete

Also, allow inprogress/complete jobs to run in parallel.

Change-Id: I1ce49b0244f7bf8ea123d53178217678c9d047e0
---
 .../files/jenkins_job_builder/config/devstack-gate.yaml         | 2 --
 .../files/jenkins_job_builder/config/macros.yaml                | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index 9e2dbef4c7..02fd317a0b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -757,7 +757,6 @@
 # jenkins slave they are running on can be disabled.
 - job:
     name: devstack-update-inprogress
-    concurrent: false
     node: devstack-launch
 
     wrappers:
@@ -780,7 +779,6 @@
 # jenkins slave may be deleted.
 - job:
     name: devstack-update-complete
-    concurrent: false
     node: devstack-launch
 
     wrappers:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index fcd66ce5b9..98de6c5523 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -179,6 +179,7 @@
     builders:
       - trigger-builds:
           - project: devstack-update-inprogress
+            block: true
             predefined-parameters:
               DEVSTACK_NODE_NAME=${NODE_NAME}