[joid] correct auth url with good admin port

[releng.git] / jjb / apex / apex.yml

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 282ae7b..115e75b 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -24,7 +24,7 @@
             branch: 'stable/brahmaputra'
             gs-pathname: '/brahmaputra'
             block-stream: 'master'
-            slave: 'opnfv-jump-1'
+            slave: 'lf-pod1'
             verify-slave: 'apex-verify-brahmaputra'
             daily-slave: 'apex-daily-brahmaputra'
             disabled: true
@@ -43,7 +43,7 @@
             branch: 'stable/brahmaputra'
             gs-pathname: '/brahmaputra'
             block-stream: 'master'
-            slave: 'opnfv-jump-1'
+            slave: 'lf-pod1'
             verify-slave: 'apex-verify-brahmaputra'
             daily-slave: 'apex-daily-brahmaputra'
             disabled: true
@@ -51,13 +51,14 @@
     project: 'apex'
 
     scenario:
+         - 'os-nosdn-nofeature-noha'
          - 'os-nosdn-nofeature-ha'
          - 'os-odl_l2-nofeature-ha'
          - 'os-odl_l2-bgpvpn-ha'
          - 'os-odl_l2-sfc-noha'
          - 'os-odl_l3-nofeature-ha'
          - 'os-onos-nofeature-ha'
-         - 'os-opencontrail-nofeature-ha'
+         - 'os-ocl-nofeature-ha'
 
     platform:
          - 'baremetal'
@@ -163,6 +164,8 @@
 
     node: '{verify-slave}'
 
+    concurrent: true
+
     parameters:
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
@@ -212,12 +215,16 @@
     properties:
         - build-blocker:
             use-build-blocker: true
+            block-level: 'NODE'
             blocking-jobs:
                 - 'apex-daily.*{stream1}'
                 - 'apex-deploy.*{stream1}'
                 - 'apex-build.*{stream1}'
                 - 'apex-runner.*{stream1}'
                 - 'apex-verify-{stream1}'
+        - throttle:
+            max-per-node: 1
+            max-total: 10
 
     builders:
         - 'apex-build'
@@ -230,11 +237,12 @@
             block: true
             same-node: true
 #        - trigger-builds:
-#          - project: 'functest-apex-{slave}-suite-{stream1}'
+#          - project: 'functest-apex-{verify-slave}-suite-{stream1}'
 #            predefined-parameters: |
 #              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
 #              FUNCTEST_SUITE_NAME=vping_userdata
 #            block: true
+#            same-node: true
         - trigger-builds:
           - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream1}'
             predefined-parameters: |
@@ -313,10 +321,12 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: '{slave}'
+    node: '{daily-slave}'
 
     disabled: false
 
+    concurrent: true
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -338,17 +348,22 @@
     properties:
         - build-blocker:
             use-build-blocker: true
+            block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*{stream}'
+        - throttle:
+            max-per-node: 1
+            max-total: 10
 
     builders:
         - 'apex-build'
         - trigger-builds:
-          - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream}'
+          - project: 'apex-deploy-virtual-os-nosdn-nofeature-noha-{stream}'
             predefined-parameters: |
               BUILD_DIRECTORY=apex-build-{stream}/build
               OPNFV_CLEAN=yes
             git-revision: false
+            same-node: true
             block: true
         - 'apex-upload-artifact'
 
@@ -362,6 +377,8 @@
     #     branch:    branch (eg. stable)
     node: '{slave}'
 
+    concurrent: true
+
     disabled: false
 
     scm:
@@ -387,8 +404,12 @@
     properties:
         - build-blocker:
             use-build-blocker: true
+            block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*{stream}'
+        - throttle:
+            max-per-node: 1
+            max-total: 10
 
     builders:
         - 'apex-deploy-virtual'
@@ -604,6 +625,7 @@
     properties:
         - build-blocker:
             use-build-blocker: true
+            block-level: 'NODE'
             blocking-jobs:
                 - 'apex-verify.*{stream1}'
                 - 'apex-deploy.*{stream1}'
@@ -618,9 +640,10 @@
           - project: 'apex-build-{stream1}'
             git-revision: true
             current-parameters: true
+            same-node: true
             block: true
         - trigger-builds:
-          - project: 'apex-deploy-virtual-nosdn-nofeature-ha-{stream1}'
+          - project: 'apex-deploy-baremetal-os-nosdn-nofeature-ha-{stream1}'
             predefined-parameters: |
               BUILD_DIRECTORY=apex-build-{stream1}/build
               OPNFV_CLEAN=yes
@@ -984,7 +1007,7 @@
 
             if [ "$OPNFV_CLEAN" == 'yes' ]; then
                 if [[ $BUILD_DIRECTORY == *verify-master* ]]; then
-                    sudo CONFIG=../lib ./clean.sh
+                    sudo CONFIG=${WORKSPACE}/build ./clean.sh
                 else
                     sudo opnfv-clean
                 fi