diff options
Diffstat (limited to 'jjb/apex')
| -rwxr-xr-x | jjb/apex/apex-build.sh | 6 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 416 |
2 files changed, 123 insertions, 299 deletions
diff --git a/jjb/apex/apex-build.sh b/jjb/apex/apex-build.sh index f6b2e3214..e3e3f6194 100755 --- a/jjb/apex/apex-build.sh +++ b/jjb/apex/apex-build.sh @@ -23,7 +23,7 @@ fi # 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/rpm_specs/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-') # list the contents of BUILD_OUTPUT directory echo "Build Directory is ${BUILD_DIRECTORY}" echo "Build Directory Contents:" @@ -44,10 +44,10 @@ if ! echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)" echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)" echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" - echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)" + echo "OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)" echo "OPNFV_SRPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.src.rpm" echo "OPNFV_RPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.noarch.rpm" - echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/noarch/opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)" + echo "OPNFV_RPM_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/noarch/opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)" echo "OPNFV_BUILD_URL=$BUILD_URL" ) > $WORKSPACE/opnfv.properties fi diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index da9089cd6..8a5a82f13 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -1,15 +1,14 @@ - project: name: apex jobs: - - 'apex-verify-{stream1}' - - 'apex-verify-{stream2}' + - 'apex-verify-{stream}' + - 'apex-verify-unit-tests-{stream}' - 'apex-runner-{platform}-{scenario}-{stream}' - - 'apex-runner-cperf-{stream1}' + - 'apex-runner-cperf-{stream}' - 'apex-build-{stream}' - 'apex-deploy-virtual-{scenario}-{stream}' - 'apex-deploy-baremetal-{scenario}-{stream}' - - 'apex-daily-{stream1}' - - 'apex-daily-{stream2}' + - 'apex-daily-{stream}' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) @@ -17,37 +16,37 @@ - master: branch: 'master' gs-pathname: '' - block-stream: 'brahmaputra' - slave: 'intel-pod7' + block-stream: 'colorado' + slave: 'lf-pod1' verify-slave: 'apex-verify-master' daily-slave: 'apex-daily-master' - - brahmaputra: - branch: 'stable/brahmaputra' - gs-pathname: '/brahmaputra' + - colorado: + branch: 'stable/colorado' + gs-pathname: '/colorado' block-stream: 'master' slave: 'lf-pod1' - verify-slave: 'apex-verify-brahmaputra' - daily-slave: 'apex-daily-brahmaputra' - disabled: true + verify-slave: 'apex-verify-colorado' + daily-slave: 'apex-daily-colorado' + disabled: false stream1: - master: branch: 'master' gs-pathname: '' - block-stream: 'brahmaputra' + block-stream: 'colorado' slave: 'lf-pod1' verify-slave: 'apex-verify-master' daily-slave: 'apex-daily-master' stream2: - - brahmaputra: - branch: 'stable/brahmaputra' - gs-pathname: '/brahmaputra' + - colorado: + branch: 'stable/colorado' + gs-pathname: '/colorado' block-stream: 'master' slave: 'lf-pod1' - verify-slave: 'apex-verify-brahmaputra' - daily-slave: 'apex-daily-brahmaputra' - disabled: true + verify-slave: 'apex-verify-colorado' + daily-slave: 'apex-daily-colorado' + disabled: false project: 'apex' @@ -55,6 +54,7 @@ - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' - 'os-nosdn-nofeature-ha-ipv6' + - 'os-nosdn-ovs-noha' - 'os-nosdn-fdio-noha' - 'os-odl_l2-nofeature-ha' - 'os-odl_l2-bgpvpn-ha' @@ -69,11 +69,13 @@ - 'baremetal' - 'virtual' -# Brahmaputra Verify +# Unit Test - job-template: - name: 'apex-verify-{stream2}' + name: 'apex-verify-unit-tests-{stream}' - node: '{slave}' + node: '{verify-slave}' + + concurrent: true parameters: - apex-parameter: @@ -113,60 +115,19 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: ANT - pattern: 'ci/**' - - compare-type: ANT - pattern: 'build/**' - - compare-type: ANT - pattern: 'lib/**' - - compare-type: ANT - pattern: 'config/**' - + pattern: 'tests/**' properties: - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'apex-daily.*{stream2}' - - 'apex-deploy.*{stream2}' - - 'apex-build.*{stream2}' - - 'apex-runner.*{stream2}' - - 'apex-verify-{stream2}' + - throttle: + max-per-node: 1 + max-total: 10 + option: 'project' builders: - 'apex-unit-test' - - 'apex-build' - - trigger-builds: - - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream2}' - predefined-parameters: | - BUILD_DIRECTORY=apex-verify-{stream2}/build_output - OPNFV_CLEAN=yes - git-revision: false - block: true - - trigger-builds: - - project: 'apex-deploy-virtual-os-onos-nofeature-ha-{stream2}' - predefined-parameters: | - BUILD_DIRECTORY=apex-verify-{stream2}/build_output - OPNFV_CLEAN=yes - git-revision: false - block: true - - trigger-builds: - - project: 'apex-deploy-virtual-os-odl_l3-nofeature-ha-{stream2}' - predefined-parameters: | - BUILD_DIRECTORY=apex-verify-{stream2}/build_output - OPNFV_CLEAN=yes - git-revision: false - block: true - - trigger-builds: - - project: 'apex-deploy-virtual-os-odl_l2-sfc-noha-{stream2}' - predefined-parameters: | - BUILD_DIRECTORY=apex-verify-{stream2}/build_output - OPNFV_CLEAN=yes - git-revision: false - block: true - - 'apex-workspace-cleanup' -# Master Verify +# Verify - job-template: - name: 'apex-verify-{stream1}' + name: 'apex-verify-{stream}' node: '{verify-slave}' @@ -223,11 +184,11 @@ use-build-blocker: true block-level: 'NODE' blocking-jobs: - - 'apex-daily.*{stream1}' - - 'apex-deploy.*{stream1}' - - 'apex-build.*{stream1}' - - 'apex-runner.*{stream1}' - - 'apex-verify-{stream1}' + - 'apex-daily.*' + - 'apex-deploy.*' + - 'apex-build.*' + - 'apex-runner.*' + - 'apex-verify.*' - throttle: max-per-node: 1 max-total: 10 @@ -237,30 +198,30 @@ - 'apex-unit-test' - 'apex-build' - trigger-builds: - - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream1}' + - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-verify-{stream1} + BUILD_DIRECTORY=apex-verify-{stream} OPNFV_CLEAN=yes git-revision: false block: true same-node: true - trigger-builds: - - project: 'functest-apex-{verify-slave}-suite-{stream1}' + - project: 'functest-apex-{verify-slave}-suite-{stream}' predefined-parameters: | DEPLOY_SCENARIO=os-nosdn-nofeature-ha FUNCTEST_SUITE_NAME=healthcheck block: true same-node: true - trigger-builds: - - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream1}' + - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-verify-{stream1} + BUILD_DIRECTORY=apex-verify-{stream} OPNFV_CLEAN=yes git-revision: false block: true same-node: true - trigger-builds: - - project: 'functest-apex-{verify-slave}-suite-{stream1}' + - project: 'functest-apex-{verify-slave}-suite-{stream}' predefined-parameters: | DEPLOY_SCENARIO=os-odl_l2-nofeature-ha FUNCTEST_SUITE_NAME=healthcheck @@ -299,8 +260,8 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'apex-daily.*{stream}' - - 'apex-verify.*{stream}' + - 'apex-daily.*' + - 'apex-verify.*' builders: - trigger-builds: @@ -329,7 +290,7 @@ unstable-threshold: 'FAILURE' - job-template: - name: 'apex-runner-cperf-{stream1}' + name: 'apex-runner-cperf-{stream}' # runner cperf job @@ -360,7 +321,7 @@ use-build-blocker: false block-level: 'NODE' blocking-jobs: - - 'apex-deploy.*{stream}' + - 'apex-deploy.*' - throttle: max-per-node: 1 max-total: 10 @@ -368,13 +329,13 @@ builders: - trigger-builds: - - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream1}' + - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream}' predefined-parameters: OPNFV_CLEAN=yes git-revision: false block: true - trigger-builds: - - project: 'cperf-apex-intel-pod2-daily-{stream1}' + - project: 'cperf-apex-intel-pod2-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-odl_l2-nofeature-ha block: true @@ -417,7 +378,7 @@ use-build-blocker: true block-level: 'NODE' blocking-jobs: - - 'apex-deploy.*{stream}' + - 'apex-deploy.*' - throttle: max-per-node: 1 max-total: 10 @@ -474,7 +435,7 @@ use-build-blocker: true block-level: 'NODE' blocking-jobs: - - 'apex-deploy.*{stream}' + - 'apex-deploy.*' - throttle: max-per-node: 1 max-total: 10 @@ -517,159 +478,18 @@ use-build-blocker: true block-level: 'NODE' blocking-jobs: - - 'apex-verify.*{stream}' - - 'apex-deploy.*{stream}' - - 'apex-build.*{stream}' + - 'apex-verify.*' + - 'apex-deploy.*' + - 'apex-build.*' builders: - 'apex-deploy' - 'apex-workspace-cleanup' -# Brahmaputra Daily +# Daily - job-template: - name: 'apex-daily-{stream2}' - - # Job template for daily build - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - # branch: branch (eg. stable) - node: '{slave}' - - disabled: true - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' - - parameters: - - project-parameter: - project: '{project}' - - apex-parameter: - gs-pathname: '{gs-pathname}' - - properties: - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'apex-verify.*{stream2}' - - 'apex-deploy.*{stream2}' - - 'apex-build.*{stream2}' - - 'apex-runner.*{stream2}' - - triggers: - - 'apex-{stream2}' - - builders: - - trigger-builds: - - project: 'apex-build-{stream2}' - git-revision: true - current-parameters: true - block: true - - trigger-builds: - - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream2}' - predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream2}/build_output - OPNFV_CLEAN=yes - git-revision: true - block: true - - trigger-builds: - - project: 'functest-apex-{slave}-daily-{stream2}' - predefined-parameters: - DEPLOY_SCENARIO=os-odl_l2-nofeature-ha - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream2}' - predefined-parameters: - DEPLOY_SCENARIO=os-odl_l2-nofeature-ha - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - trigger-builds: - - project: 'apex-deploy-baremetal-os-onos-nofeature-ha-{stream2}' - predefined-parameters: - BUILD_DIRECTORY=apex-build-{stream2}/build_output - git-revision: true - block: true - - trigger-builds: - - project: 'functest-apex-{slave}-daily-{stream2}' - predefined-parameters: - DEPLOY_SCENARIO=os-onos-nofeature-ha - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream2}' - predefined-parameters: - DEPLOY_SCENARIO=os-onos-nofeature-ha - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - trigger-builds: - - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream2}' - predefined-parameters: - BUILD_DIRECTORY=apex-build-{stream2}/build_output - git-revision: true - block: true - - trigger-builds: - - project: 'functest-apex-{slave}-daily-{stream2}' - 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-{slave}-daily-{stream2}' - 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: 'apex-deploy-baremetal-os-odl_l2-bgpvpn-ha-{stream2}' - predefined-parameters: - BUILD_DIRECTORY=apex-build-{stream2}/build_output - git-revision: true - block: true - - trigger-builds: - - project: 'functest-apex-{slave}-daily-{stream2}' - predefined-parameters: - DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream2}' - predefined-parameters: - DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - -# Master Daily -- job-template: - name: 'apex-daily-{stream1}' + name: 'apex-daily-{stream}' # Job template for daily build # @@ -697,25 +517,25 @@ use-build-blocker: true block-level: 'NODE' blocking-jobs: - - 'apex-verify.*{stream1}' - - 'apex-deploy.*{stream1}' - - 'apex-build.*{stream1}' - - 'apex-runner.*{stream1}' + - 'apex-verify.*' + - 'apex-deploy.*' + - 'apex-build.*' + - 'apex-runner.*' triggers: - - 'apex-{stream1}' + - 'apex-{stream}' builders: - trigger-builds: - - project: 'apex-build-{stream1}' + - project: 'apex-build-{stream}' git-revision: true current-parameters: true same-node: true block: true - trigger-builds: - - project: 'apex-deploy-baremetal-os-nosdn-nofeature-ha-{stream1}' + - project: 'apex-deploy-baremetal-os-nosdn-nofeature-ha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream1}/build + BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes git-revision: true same-node: true @@ -723,7 +543,7 @@ build-step-failure-threshold: 'never' block: true - trigger-builds: - - project: 'functest-apex-{daily-slave}-daily-{stream1}' + - project: 'functest-apex-{daily-slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-nosdn-nofeature-ha block: true @@ -733,7 +553,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream1}' + - project: 'yardstick-apex-{slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-nosdn-nofeature-ha block: true @@ -743,9 +563,9 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream1}' + - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream1}/build + BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes git-revision: true same-node: true @@ -753,7 +573,7 @@ build-step-failure-threshold: 'never' block: true - trigger-builds: - - project: 'functest-apex-{daily-slave}-daily-{stream1}' + - project: 'functest-apex-{daily-slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-odl_l2-nofeature-ha block: true @@ -763,7 +583,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream1}' + - project: 'yardstick-apex-{slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-odl_l2-nofeature-ha block: true @@ -773,9 +593,9 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream1}' + - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream1}/build + BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes git-revision: true same-node: true @@ -783,7 +603,7 @@ build-step-failure-threshold: 'never' block: true - trigger-builds: - - project: 'functest-apex-{daily-slave}-daily-{stream1}' + - project: 'functest-apex-{daily-slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-odl_l3-nofeature-ha block: true @@ -793,7 +613,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream1}' + - project: 'yardstick-apex-{slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-odl_l3-nofeature-ha block: true @@ -803,9 +623,9 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-baremetal-os-onos-nofeature-ha-{stream1}' + - project: 'apex-deploy-baremetal-os-onos-nofeature-ha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream1}/build + BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes git-revision: true same-node: true @@ -813,7 +633,7 @@ build-step-failure-threshold: 'never' block: true - trigger-builds: - - project: 'functest-apex-{daily-slave}-daily-{stream1}' + - project: 'functest-apex-{daily-slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-onos-nofeature-ha block: true @@ -823,7 +643,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream1}' + - project: 'yardstick-apex-{slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-onos-nofeature-ha block: true @@ -833,9 +653,9 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-baremetal-os-odl_l2-bgpvpn-ha-{stream1}' + - project: 'apex-deploy-baremetal-os-odl_l2-bgpvpn-ha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream1}/build + BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes git-revision: true same-node: true @@ -843,7 +663,7 @@ build-step-failure-threshold: 'never' block: true - trigger-builds: - - project: 'functest-apex-{daily-slave}-daily-{stream1}' + - project: 'functest-apex-{daily-slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha block: true @@ -853,7 +673,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream1}' + - project: 'yardstick-apex-{slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha block: true @@ -863,9 +683,9 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-baremetal-os-onos-sfc-ha-{stream1}' + - project: 'apex-deploy-baremetal-os-onos-sfc-ha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream1}/build + BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes git-revision: true same-node: true @@ -873,7 +693,7 @@ build-step-failure-threshold: 'never' block: true - trigger-builds: - - project: 'functest-apex-{daily-slave}-daily-{stream1}' + - project: 'functest-apex-{daily-slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-onos-sfc-ha block: true @@ -883,7 +703,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream1}' + - project: 'yardstick-apex-{slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-onos-sfc-ha block: true @@ -893,9 +713,9 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-baremetal-os-odl_l2-sfc-noha-{stream1}' + - project: 'apex-deploy-baremetal-os-odl_l2-sfc-noha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream1}/build + BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes git-revision: true same-node: true @@ -903,7 +723,7 @@ build-step-failure-threshold: 'never' block: true - trigger-builds: - - project: 'functest-apex-{daily-slave}-daily-{stream1}' + - project: 'functest-apex-{daily-slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-odl_l2-sfc-noha block: true @@ -913,7 +733,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream1}' + - project: 'yardstick-apex-{slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-odl_l2-sfc-noha block: true @@ -923,9 +743,9 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-baremetal-os-odl_l2-fdio-noha-{stream1}' + - project: 'apex-deploy-baremetal-os-odl_l2-fdio-noha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream1}/build + BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes git-revision: true same-node: true @@ -933,7 +753,7 @@ build-step-failure-threshold: 'never' block: true - trigger-builds: - - project: 'functest-apex-{daily-slave}-daily-{stream1}' + - project: 'functest-apex-{daily-slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-odl_l2-fdio-noha block: true @@ -943,7 +763,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream1}' + - project: 'yardstick-apex-{slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-odl_l2-fdio-noha block: true @@ -953,9 +773,9 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-baremetal-os-nosdn-fdio-noha-{stream1}' + - project: 'apex-deploy-baremetal-os-nosdn-fdio-noha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream1}/build + BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes git-revision: true same-node: true @@ -963,7 +783,7 @@ build-step-failure-threshold: 'never' block: true - trigger-builds: - - project: 'functest-apex-{daily-slave}-daily-{stream1}' + - project: 'functest-apex-{daily-slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-nosdn-fdio-noha block: true @@ -973,7 +793,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream1}' + - project: 'yardstick-apex-{slave}-daily-{stream}' predefined-parameters: DEPLOY_SCENARIO=os-nosdn-fdio-noha block: true @@ -983,9 +803,9 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-baremetal-os-nosdn-fdio-noha-{stream1}' + - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-ipv6-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream1}/build + BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes git-revision: true same-node: true @@ -993,19 +813,19 @@ build-step-failure-threshold: 'never' block: true - trigger-builds: - - project: 'functest-apex-{daily-slave}-daily-{stream1}' - predefined-parameters: - DEPLOY_SCENARIO=os-nosdn-fdio-noha - block: true + - project: 'apex-deploy-baremetal-os-nosdn-ovs-noha-{stream}' + predefined-parameters: | + BUILD_DIRECTORY=apex-build-{stream}/build + OPNFV_CLEAN=yes + git-revision: true same-node: true block-thresholds: build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' + block: true - trigger-builds: - - project: 'yardstick-apex-{slave}-daily-{stream1}' + - project: 'functest-apex-{daily-slave}-daily-{stream}' predefined-parameters: - DEPLOY_SCENARIO=os-nosdn-fdio-noha + DEPLOY_SCENARIO=os-nosdn-ovs-noha block: true same-node: true block-thresholds: @@ -1013,15 +833,15 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-ipv6-{stream1}' - predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream1}/build - OPNFV_CLEAN=yes - git-revision: true + - project: 'yardstick-apex-{slave}-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-nosdn-ovs-noha + block: true same-node: true block-thresholds: build-step-failure-threshold: 'never' - block: true + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'apex-gs-clean-{stream}' @@ -1074,6 +894,10 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW." - string: + name: GS_PATHNAME + default: '{gs-pathname}' + description: "Version directory where opnfv artifacts are stored in gs repository" + - string: name: GS_URL default: artifacts.opnfv.org/$PROJECT{gs-pathname} description: "URL to Google Storage." @@ -1124,9 +948,9 @@ - trigger: name: 'apex-master' triggers: - - timed: '0 3 * * *' + - timed: '0 0 20 8 *' - trigger: - name: 'apex-brahmaputra' + name: 'apex-colorado' triggers: - timed: '0 3 * * *' - trigger: |