diff options
Diffstat (limited to 'jjb/apex/apex.yml')
| -rw-r--r-- | jjb/apex/apex.yml | 70 |
1 files changed, 44 insertions, 26 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 2719b3a47..35e8e3da5 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -14,16 +14,18 @@ - master: branch: 'master' gs-pathname: '' + block-stream: 'brahmaputra' - brahmaputra: branch: 'stable/brahmaputra' gs-pathname: '/brahmaputra' - disabled: true + block-stream: 'master' + disabled: false project: 'apex' scenario: - 'os-odl_l2-nofeature-ha' - - 'os-odl_l2-sfc-ha' + - 'os-odl_l2-sfc-noha' - 'os-odl_l3-nofeature-ha' - 'os-onos-nofeature-ha' - 'os-opencontrail-nofeature-ha' @@ -61,7 +63,7 @@ - patchset-created-event: exclude-drafts: 'false' exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' + exclude-no-code-change: 'true' - draft-published-event - comment-added-contains-event: comment-contains-value: 'recheck' @@ -82,9 +84,6 @@ pattern: 'lib/**' - compare-type: ANT pattern: 'config/**' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' properties: - build-blocker: @@ -94,25 +93,32 @@ - "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 + - trigger-builds: + - project: 'apex-deploy-virtual-os-odl_l2-sfc-noha-{stream}' + predefined-parameters: + BUILD_DIRECTORY=apex-verify-{stream}/build_output git-revision: false block: true - 'apex-workspace-cleanup' @@ -157,16 +163,18 @@ git-revision: false block: true - trigger-builds: - - project: 'functest-apex-opnfv-jump-1-daily-{stream}' + - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' predefined-parameters: - DEPLOY_SCENARIO='{scenario}' + DEPLOY_SCENARIO={scenario} 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' @@ -214,7 +222,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 +351,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: @@ -357,6 +365,8 @@ unstable-threshold: 'FAILURE' - trigger-builds: - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-odl_l2-nofeature-ha block: true block-thresholds: build-step-failure-threshold: 'never' @@ -365,7 +375,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: @@ -379,6 +389,8 @@ unstable-threshold: 'FAILURE' - trigger-builds: - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-onos-nofeature-ha block: true block-thresholds: build-step-failure-threshold: 'never' @@ -387,7 +399,7 @@ - trigger-builds: - project: 'apex-deploy-baremetal-os-odl_l3-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: @@ -401,6 +413,8 @@ unstable-threshold: 'FAILURE' - trigger-builds: - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-odl_l3-nofeature-ha block: true block-thresholds: build-step-failure-threshold: 'never' @@ -456,16 +470,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 @@ -594,7 +612,7 @@ fi 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 @@ -730,8 +748,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 * * *' |