Wait for inprogress jobs to complete

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

Change-Id: I1ce49b0244f7bf8ea123d53178217678c9d047e0

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:

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}