Apex: fixes blocking with daily

Change-Id: I03cf0207075116de44ebde03429ab5b499db540b
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 4aff18b..4956123 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -13,7 +13,7 @@
         - 'apex-csit-promote-daily-{stream}'
         - 'apex-fdio-promote-daily-{stream}'
         - 'apex-verify-iso-{stream}'
-        - 'apex-deploy-test-baremetal-{stream}'
+        - 'apex-run-deploy-test-baremetal-{stream}'
         - 'apex-upload-snapshot'
         - 'apex-create-snapshot'
     # stream:    branch with - in place of / (eg. stable-arno)
@@ -545,7 +545,7 @@
 
 # Baremetal Deploy and Test
 - job-template:
-    name: 'apex-deploy-test-baremetal-{stream}'
+    name: 'apex-run-deploy-test-baremetal-{stream}'
 
     # Job template for daily build
     #
@@ -578,9 +578,9 @@
             block-level: 'NODE'
             blocking-jobs:
                 - 'apex-verify.*'
-                - 'apex-deploy.*'
                 - 'apex-runner.*'
                 - 'apex-.*-promote.*'
+                - 'apex-run.*'
     builders:
         - description-setter:
             description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
@@ -692,7 +692,7 @@
             condition: SUCCESSFUL
             projects:
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -702,7 +702,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -712,7 +712,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -722,7 +722,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -732,7 +732,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -742,7 +742,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -752,7 +752,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -762,7 +762,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -772,7 +772,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -782,7 +782,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -792,7 +792,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -802,7 +802,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -812,7 +812,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -822,7 +822,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -832,7 +832,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -842,7 +842,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -852,7 +852,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -862,7 +862,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -872,7 +872,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -882,7 +882,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -892,7 +892,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -902,7 +902,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -912,7 +912,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -922,7 +922,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -932,7 +932,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -942,7 +942,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1023,7 +1023,7 @@
             condition: SUCCESSFUL
             projects:
 
-                - name: 'apex-deploy-test-baremetal-master'
+                - name: 'apex-run-deploy-test-baremetal-master'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1033,7 +1033,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-master'
+                - name: 'apex-run-deploy-test-baremetal-master'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1043,7 +1043,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-master'
+                - name: 'apex-run-deploy-test-baremetal-master'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1053,7 +1053,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-master'
+                - name: 'apex-run-deploy-test-baremetal-master'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 14e3433..1df6e15 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -13,7 +13,7 @@
         - 'apex-csit-promote-daily-{stream}'
         - 'apex-fdio-promote-daily-{stream}'
         - 'apex-verify-iso-{stream}'
-        - 'apex-deploy-test-baremetal-{stream}'
+        - 'apex-run-deploy-test-baremetal-{stream}'
         - 'apex-upload-snapshot'
         - 'apex-create-snapshot'
     # stream:    branch with - in place of / (eg. stable-arno)
@@ -545,7 +545,7 @@
 
 # Baremetal Deploy and Test
 - job-template:
-    name: 'apex-deploy-test-baremetal-{stream}'
+    name: 'apex-run-deploy-test-baremetal-{stream}'
 
     # Job template for daily build
     #
@@ -578,9 +578,9 @@
             block-level: 'NODE'
             blocking-jobs:
                 - 'apex-verify.*'
-                - 'apex-deploy.*'
                 - 'apex-runner.*'
                 - 'apex-.*-promote.*'
+                - 'apex-run.*'
     builders:
         - description-setter:
             description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
@@ -692,7 +692,7 @@
             condition: SUCCESSFUL
             projects:
 {% for scenario in scenarios[stream] %}
-                - name: 'apex-deploy-test-baremetal-{{ stream }}'
+                - name: 'apex-run-deploy-test-baremetal-{{ stream }}'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |