X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml;h=49561238878788bc033626ad49c47d993204ca14;hb=d040efc3be330026148c83e434a5d2b80c1543dc;hp=d8b9eb1475ff1296727be5bf498b6f32064a0d34;hpb=00f3a6a8f37f1ee4ddfb7f24f0cf9bb4e3b124c1;p=releng.git

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index d8b9eb147..495612388 100644
--- 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)
@@ -152,9 +152,8 @@
                 - 'apex-daily.*'
                 - 'apex-deploy.*'
                 - 'apex-runner.*'
-                - 'apex-verify.*'
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -286,11 +285,9 @@
             blocking-jobs:
                 - 'apex-daily.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
-                - 'apex-verify.*'
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -429,7 +426,7 @@
     properties:
         - logrotate-default
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -531,6 +528,8 @@
             block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*'
+                - 'functest.*'
+                - 'yardstick.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -546,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
     #
@@ -579,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"
@@ -665,7 +664,7 @@
                   current-parameters: false
                   predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -679,9 +678,9 @@
                 - name: 'apex-verify-iso-danube'
                   current-parameters: false
                   predefined-parameters: |
-                    BUILD_DIRECTORY=apex-build-danube/.build
+                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-danube/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -693,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: |
@@ -703,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: |
@@ -713,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: |
@@ -723,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: |
@@ -733,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: |
@@ -743,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: |
@@ -753,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: |
@@ -763,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: |
@@ -773,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: |
@@ -783,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: |
@@ -793,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: |
@@ -803,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: |
@@ -813,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: |
@@ -823,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: |
@@ -833,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: |
@@ -843,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: |
@@ -853,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: |
@@ -863,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: |
@@ -873,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: |
@@ -883,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: |
@@ -893,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: |
@@ -903,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: |
@@ -913,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: |
@@ -923,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: |
@@ -933,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: |
@@ -943,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: |
@@ -996,7 +995,7 @@
                   current-parameters: false
                   predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -1010,9 +1009,9 @@
                 - name: 'apex-verify-iso-master'
                   current-parameters: false
                   predefined-parameters: |
-                    BUILD_DIRECTORY=apex-build-master/.build
+                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-master/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -1024,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: |
@@ -1034,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: |
@@ -1044,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: |
@@ -1054,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: |
@@ -1127,7 +1126,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'
 
@@ -1235,7 +1233,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'