diff options
| -rw-r--r-- | jjb/apex/apex.yml | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 21d6018f7..acc0550fb 100644 --- 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' @@ -94,25 +96,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-master/build_output + BUILD_DIRECTORY=apex-verify-{stream}/build_output git-revision: false block: true - 'apex-workspace-cleanup' @@ -159,7 +162,7 @@ - trigger-builds: - project: 'functest-apex-opnfv-jump-1-daily-{stream}' predefined-parameters: - DEPLOY_SCENARIO='{scenario}' + DEPLOY_SCENARIO={scenario} block: true block-thresholds: build-step-failure-threshold: 'never' @@ -214,7 +217,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' @@ -343,7 +346,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: @@ -365,7 +368,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: @@ -456,16 +459,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 @@ -730,8 +737,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 * * *' |