Merge "Rectify inter-job blocking strategy"

[releng.git] / jjb / storperf / storperf-verify-jobs.yml

diff --git a/jjb/storperf/storperf-verify-jobs.yml b/jjb/storperf/storperf-verify-jobs.yml
index 129c4d1..55c4e4c 100644 (file)
--- a/jjb/storperf/storperf-verify-jobs.yml
+++ b/jjb/storperf/storperf-verify-jobs.yml
@@ -36,6 +36,8 @@
 
     disabled: '{obj:disabled}'
 
+    project-type: 'multijob'
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -73,8 +75,8 @@
             # in phase jobs
             echo "Triggering phase jobs!"
         - multijob:
-            name: 'unit-test'
-            condition: SUCCESSFUL
+            name: 'storperf-build-and-unittest'
+            execution-type: PARALLEL
             projects:
                 - name: 'storperf-verify-unit-test-{stream}'
                   current-parameters: false
@@ -87,9 +89,6 @@
                   node-parameters: false
                   kill-phase-on: FAILURE
                   abort-all-job: false
-            name: 'build-x86_64'
-            condition: SUCCESSFUL
-            projects:
                 - name: 'storperf-verify-build-x86_64-{stream}'
                   current-parameters: false
                   predefined-parameters: |
@@ -102,9 +101,6 @@
                   node-parameters: false
                   kill-phase-on: FAILURE
                   abort-all-job: false
-            name: 'build-aarch64'
-            condition: SUCCESSFUL
-            projects:
                 - name: 'storperf-verify-build-aarch64-{stream}'
                   current-parameters: false
                   predefined-parameters: |
@@ -129,6 +125,9 @@
             timeout: 30
 
     parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
         - '{slave-label}-defaults'
 
     scm: