apex: migrates functest after yardstick for runner jobs

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index a1b922c..5f8d067 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -14,10 +14,12 @@
         - master:
             branch: 'master'
             gs-pathname: ''
+            block-stream: 'brahmaputra'
         - brahmaputra:
             branch: 'stable/brahmaputra'
             gs-pathname: '/brahmaputra'
-            disabled: true
+            block-stream: 'master'
+            disabled: false
 
     project: 'apex'
 
@@ -82,9 +84,6 @@
                     pattern: 'lib/**'
                   - compare-type: ANT
                     pattern: 'config/**'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
 
     properties:
         - build-blocker:
@@ -94,19 +93,26 @@
                 - "apex-deploy.*"
                 - "apex-build.*"
                 - "apex-runner.*"
+                - 'apex-verify-{block-stream}'
 
     builders:
         - 'apex-build'
         - trigger-builds:
           - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}'
             predefined-parameters:
-              BUILD_DIRECTORY=apex-verify-master/build_output
+              BUILD_DIRECTORY=apex-verify-{stream}/build_output
             git-revision: false
             block: true
         - trigger-builds:
           - project: 'apex-deploy-virtual-os-onos-nofeature-ha-{stream}'
             predefined-parameters:
-              BUILD_DIRECTORY=apex-verify-master/build_output
+              BUILD_DIRECTORY=apex-verify-{stream}/build_output
+            git-revision: false
+            block: true
+        - trigger-builds:
+          - project: 'apex-deploy-virtual-os-odl_l3-nofeature-ha-{stream}'
+            predefined-parameters:
+              BUILD_DIRECTORY=apex-verify-{stream}/build_output
             git-revision: false
             block: true
         - 'apex-workspace-cleanup'
@@ -151,16 +157,16 @@
             git-revision: false
             block: true
         - trigger-builds:
-          - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
-            predefined-parameters:
-              DEPLOY_SCENARIO='{scenario}'
+          - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
             block: true
             block-thresholds:
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
         - trigger-builds:
-          - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+          - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
             block: true
             block-thresholds:
                 build-step-failure-threshold: 'never'
@@ -208,7 +214,7 @@
         - trigger-builds:
           - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}'
             predefined-parameters:
-              BUILD_DIRECTORY=apex-build-master/build_output
+              BUILD_DIRECTORY=apex-build-{stream}/build_output
             git-revision: false
             block: true
         - 'apex-upload-artifact'
@@ -337,7 +343,7 @@
         - trigger-builds:
           - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream}'
             predefined-parameters:
-              BUILD_DIRECTORY=apex-build-master/build_output
+              BUILD_DIRECTORY=apex-build-{stream}/build_output
             git-revision: true
             block: true
         - trigger-builds:
@@ -359,7 +365,7 @@
         - trigger-builds:
           - project: 'apex-deploy-baremetal-os-onos-nofeature-ha-{stream}'
             predefined-parameters:
-              BUILD_DIRECTORY=apex-build-master/build_output
+              BUILD_DIRECTORY=apex-build-{stream}/build_output
             git-revision: true
             block: true
         - trigger-builds:
@@ -378,6 +384,28 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
+#        - trigger-builds:
+#          - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
+#            predefined-parameters:
+#              BUILD_DIRECTORY=apex-build-master/build_output
+#            git-revision: true
+#            block: true
+#        - trigger-builds:
+#          - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+#            predefined-parameters:
+#              DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+#            block: true
+#            block-thresholds:
+#                build-step-failure-threshold: 'never'
+#                failure-threshold: 'never'
+#                unstable-threshold: 'FAILURE'
+#        - trigger-builds:
+#          - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+#            block: true
+#            block-thresholds:
+#                build-step-failure-threshold: 'never'
+#                failure-threshold: 'never'
+#                unstable-threshold: 'FAILURE'
 
 ########################
 # parameter macros
@@ -428,16 +456,20 @@
             # create the cache directory if it doesn't exist
             [[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY
             # set OPNFV_ARTIFACT_VERSION
-            if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
-              export OPNFV_ARTIFACT_VERSION="bramaputra.1.rc0"
-            else
-              if echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
+            if echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
+              if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+                export OPNFV_ARTIFACT_VERSION=brahmaputra-dev${BUILD_NUMBER}
+              else
                 export OPNFV_ARTIFACT_VERSION=dev${BUILD_NUMBER}
-              elif [ "$ARTIFACT_VERSION" == "daily" ]; then
-                export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
+              fi
+            elif [ "$ARTIFACT_VERSION" == "daily" ]; then
+              if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+                export OPNFV_ARTIFACT_VERSION=brahmaputra-$(date -u +"%Y-%m-%d")
               else
-                export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION}
+                export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
               fi
+            else
+                export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION}
             fi
             # start the build
             cd $WORKSPACE/ci
@@ -493,12 +525,12 @@
             gsutil cp $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1
             RPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_RPM_URL)
             RPM_LIST=$RPM_INSTALL_PATH
-            for pkg in common undercloud; do
+            for pkg in common undercloud opendaylight-sfc; do
                 RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
             done
             SRPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_SRPM_URL)
             SRPM_LIST=$SRPM_INSTALL_PATH
-            for pkg in common undercloud; do
+            for pkg in common undercloud opendaylight-sfc; do
                 SRPM_LIST+=" ${SRPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
             done
             for artifact in $RPM_LIST $SRPM_LIST; do
@@ -591,7 +623,7 @@
               if [ -n "$DEPLOY_SCENARIO" ]; then
                 echo "Deploy Scenario set to ${DEPLOY_SCENARIO}"
                 if [ -e /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml ]; then
-                  sudo opnfv-deploy -v -d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml -n /etc/opnfv-apex/network_settings.yaml
+                  sudo opnfv-deploy -v -d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml -n /etc/opnfv-apex/network_settings.yaml --debug
                 else
                   echo "File does not exist /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml"
                   exit 1
@@ -678,7 +710,7 @@
                 if [ -e /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml ]; then
                   sudo opnfv-deploy -i  /root/inventory/pod_settings.yaml \
                   -d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml \
-                  -n /root/network/network_settings.yaml
+                  -n /root/network/network_settings.yaml --debug
                 else
                   echo "File does not exist /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml"
                   exit 1
@@ -702,8 +734,8 @@
 - trigger:
     name: 'apex-master'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 3 * 12 *'
 - trigger:
     name: 'apex-brahmaputra'
     triggers:
-        - timed: '0 6 * * 2050'
+        - timed: '0 3 * * *'