Apex: enable throttling for parallel jobs per node

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 29e353b..ce673b2 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -18,12 +18,16 @@
             gs-pathname: ''
             block-stream: 'brahmaputra'
             slave: 'intel-pod7'
+            verify-slave: 'apex-verify-master'
+            daily-slave: 'apex-daily-master'
         - brahmaputra:
             branch: 'stable/brahmaputra'
             gs-pathname: '/brahmaputra'
             block-stream: 'master'
             slave: 'opnfv-jump-1'
-            disabled: false
+            verify-slave: 'apex-verify-brahmaputra'
+            daily-slave: 'apex-daily-brahmaputra'
+            disabled: true
 
     stream1:
         - master:
@@ -31,6 +35,8 @@
             gs-pathname: ''
             block-stream: 'brahmaputra'
             slave: 'intel-pod7'
+            verify-slave: 'apex-verify-master'
+            daily-slave: 'apex-daily-master'
 
     stream2:
         - brahmaputra:
@@ -38,7 +44,9 @@
             gs-pathname: '/brahmaputra'
             block-stream: 'master'
             slave: 'opnfv-jump-1'
-            disabled: false
+            verify-slave: 'apex-verify-brahmaputra'
+            daily-slave: 'apex-daily-brahmaputra'
+            disabled: true
 
     project: 'apex'
 
@@ -153,7 +161,7 @@
 - job-template:
     name: 'apex-verify-{stream1}'
 
-    node: '{slave}'
+    node: '{verify-slave}'
 
     parameters:
         - apex-parameter:
@@ -204,12 +212,15 @@
     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
 
     builders:
         - 'apex-build'
@@ -220,12 +231,14 @@
               OPNFV_CLEAN=yes
             git-revision: false
             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: |
@@ -233,6 +246,7 @@
               OPNFV_CLEAN=yes
             git-revision: false
             block: true
+            same-node: true
         - 'apex-workspace-cleanup'
 
 - job-template:
@@ -303,7 +317,7 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: '{slave}'
+    node: '{daily-slave}'
 
     disabled: false
 
@@ -328,8 +342,11 @@
     properties:
         - build-blocker:
             use-build-blocker: true
+            block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*{stream}'
+        - throttle:
+            max-per-node: 1
 
     builders:
         - 'apex-build'
@@ -339,6 +356,7 @@
               BUILD_DIRECTORY=apex-build-{stream}/build
               OPNFV_CLEAN=yes
             git-revision: false
+            same-node: true
             block: true
         - 'apex-upload-artifact'
 
@@ -377,8 +395,11 @@
     properties:
         - build-blocker:
             use-build-blocker: true
+            block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*{stream}'
+        - throttle:
+            max-per-node: 1
 
     builders:
         - 'apex-deploy-virtual'
@@ -575,7 +596,7 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: '{slave}'
+    node: '{daily-slave}'
 
     disabled: false
 
@@ -594,6 +615,7 @@
     properties:
         - build-blocker:
             use-build-blocker: true
+            block-level: 'NODE'
             blocking-jobs:
                 - 'apex-verify.*{stream1}'
                 - 'apex-deploy.*{stream1}'
@@ -608,6 +630,7 @@
           - 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}'
@@ -615,12 +638,14 @@
               BUILD_DIRECTORY=apex-build-{stream1}/build
               OPNFV_CLEAN=yes
             git-revision: true
+            same-node: true
             block: true
         - trigger-builds:
           - project: 'functest-apex-{slave}-daily-{stream1}'
             predefined-parameters:
               DEPLOY_SCENARIO=os-nosdn-nofeature-ha
             block: true
+            same-node: true
             block-thresholds:
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
@@ -630,6 +655,7 @@
             predefined-parameters:
               DEPLOY_SCENARIO=os-nosdn-nofeature-ha
             block: true
+            same-node: true
             block-thresholds:
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
@@ -739,7 +765,7 @@
             # start the build
             cd $WORKSPACE/ci
             ./build.sh $BUILD_ARGS
-            RPM_VERSION=$(grep Version $BUILD_DIRECTORY/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
+            RPM_VERSION=$(grep Version: $BUILD_DIRECTORY/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
             # list the contents of BUILD_OUTPUT directory
             ls -al $BUILD_DIRECTORY
             # save information regarding artifact into file
@@ -797,7 +823,7 @@
             SRPM_INSTALL_PATH=$BUILD_DIRECTORY
             SRPM_LIST=$SRPM_INSTALL_PATH/$(basename $OPNFV_SRPM_URL)
             for pkg in common undercloud opendaylight-sfc onos; do
-                SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
+                SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
             done
             for artifact in $RPM_LIST $SRPM_LIST; do
               gsutil cp $artifact gs://$GS_URL/$(basename $artifact) > gsutil.iso.log 2>&1
@@ -935,25 +961,38 @@
             else
                 VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | sed 's/opnfv-apex-//')
                 for pkg in common undercloud opendaylight-sfc onos; do
-                    RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
+                    RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
                 done
 
                 # update / install the new rpm
                 if rpm -q opnfv-apex > /dev/null; then
-                   if [ $(basename $OPNFV_RPM_URL) == $(rpm -q opnfv-apex).rpm ]; then
-                     echo "RPM is already installed"
-                   elif sudo yum update -y $RPM_LIST | grep "does not update installed package"; then
-                       if ! sudo yum downgrade -y $RPM_LIST; then
-                         sudo yum remove -y opnfv-undercloud opnfv-common
-                         sudo yum downgrade -y $RPM_INSTALL_PATH
+                   INSTALLED_RPMS=$(rpm -qa | grep apex)
+                   for x in $INSTALLED_RPMS; do
+                     INSTALLED_RPM_VER=$(echo $x | sed 's/opnfv-apex-//').rpm
+                     # Does each RPM's version match the version required for deployment
+                     if [ "$INSTALLED_RPM_VER" == "$VERSION_EXTENSION" ]; then
+                       echo "RPM $x is already installed"
+                     else
+                       echo "RPM $x does not match $VERSION_EXTENSION"
+                       echo "Will upgrade/downgrade RPMs..."
+                       # Try to upgrade/downgrade RPMS
+                       if sudo yum update -y $RPM_LIST | grep "does not update installed package"; then
+                         if ! sudo yum downgrade -y $RPM_LIST; then
+                           sudo yum remove -y opnfv-apex-undercloud opnfv-apex-common opnfv-apex-opendaylight-sfc opnfv-apex-onos
+                           sudo yum downgrade -y $RPM_INSTALL_PATH
+                         fi
                        fi
-                   fi
+                       break
+                     fi
+                   done
                 else
                    sudo yum install -y $RPM_LIST;
                 fi
                 DEPLOY_CMD=opnfv-deploy
                 DEPLOY_FILE="/etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml"
                 NETWORK_FILE="/etc/opnfv-apex/network_settings.yaml"
+                export RESOURCES="/var/opt/opnfv/images"
+                export CONFIG="/var/opt/opnfv"
             fi
 
             if [ "$OPNFV_CLEAN" == 'yes' ]; then