diff options
Diffstat (limited to 'jjb')
69 files changed, 939 insertions, 172 deletions
diff --git a/jjb/apex/apex-rtd-jobs.yaml b/jjb/apex/apex-rtd-jobs.yaml new file mode 100644 index 000000000..16ae7d9de --- /dev/null +++ b/jjb/apex/apex-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: apex-rtd + project: apex + project-name: apex + + project-pattern: 'apex' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-apex/47262/' + rtd-token: '134db049c774ab06c41db432e3a042a982f50edf' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 854aefc7f..9cccf6dcd 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -354,13 +354,17 @@ abort-all-job: true git-revision: true - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_repo + features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') + if [ "$features" == 'rocky' ]; then + echo "DOCKER_TAG=hunter" > functest_tag + elif [[ "$features" =~ 'rocky' ]]; then + echo "DOCKER_TAG=hunter" > functest_tag else - echo 'REPO=ollivier' > functest_repo + echo "DOCKER_TAG=''" > functest_tag fi - inject: - properties-file: functest_repo + properties-file: functest_tag + override-build-parameters: true - multijob: name: functest-smoke condition: ALWAYS @@ -369,9 +373,9 @@ current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG="" FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase - REPO=$REPO GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 5a8f241b1..7a9106e38 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -475,14 +475,6 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true - - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_repo - else - echo 'REPO=ollivier' > functest_repo - fi - - inject: - properties-file: functest_repo - multijob: name: functest-smoke condition: ALWAYS @@ -493,7 +485,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME - REPO=$REPO GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER @@ -586,22 +577,20 @@ abort-all-job: true git-revision: false - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_properties - else - echo 'REPO=ollivier' > functest_properties - fi features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') - if [ "$features" == 'queens' ]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p') - elif [[ "$features" =~ 'queens' ]]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p') + if [ "$features" == 'rocky' ]; then + functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-rocky-(noha|ha)/\1-nofeature-\2/p') + echo "DOCKER_TAG=hunter" > functest_scenario + elif [[ "$features" =~ 'rocky' ]]; then + functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_rocky-(noha|ha)/\1-\2-\3/p') + echo "DOCKER_TAG=hunter" > functest_scenario else functest_scenario=$DEPLOY_SCENARIO + echo "DOCKER_TAG=''" > functest_scenario fi - echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties + echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario - inject: - properties-file: functest_properties + properties-file: functest_scenario override-build-parameters: true - multijob: name: 'OPNFV Test Suite' @@ -610,8 +599,9 @@ - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true current-parameters: false - predefined-parameters: + predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: true git-revision: false @@ -652,6 +642,10 @@ name: DEPLOY_SCENARIO default: '{scenario}' description: "Scenario to deploy with." + - string: + name: DOCKER_TAG + default: '' + description: Default docker tag to pass to functest properties: - logrotate-default @@ -680,6 +674,7 @@ current-parameters: false predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: false git-revision: false @@ -885,7 +880,7 @@ description: "Used for overriding the PROMOTE" - string: name: GS_URL - default: $GS_BASE{gs-pathname}/{os_version}/{topology} + default: 'artifacts.opnfv.org/apex/{os_version}/{topology}' description: "User for overriding GS_URL from apex params" - string: name: OS_VERSION @@ -895,7 +890,10 @@ name: ODL_BRANCH default: '{odl_branch}' description: ODL branch being used - + - string: + name: FORCE_PROMOTE + default: 'False' + description: "Used to force promotion and skip CSIT" properties: - build-blocker: use-build-blocker: true @@ -955,6 +953,7 @@ SSH_KEY_PATH=/tmp/csit/id_rsa ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION + SKIP_CSIT=$FORCE_PROMOTE node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -2028,12 +2027,12 @@ - trigger: name: 'master-master' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-rocky' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-queens' @@ -2053,7 +2052,7 @@ - trigger: name: 'gambia-queens' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'fraser-master' diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 908acb62c..329d2c9f5 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -321,14 +321,6 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true - - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_repo - else - echo 'REPO=ollivier' > functest_repo - fi - - inject: - properties-file: functest_repo - multijob: name: functest-smoke condition: ALWAYS @@ -339,7 +331,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME - REPO=$REPO GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER @@ -432,22 +423,20 @@ abort-all-job: true git-revision: false - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_properties - else - echo 'REPO=ollivier' > functest_properties - fi features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') - if [ "$features" == 'queens' ]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p') - elif [[ "$features" =~ 'queens' ]]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p') + if [ "$features" == 'rocky' ]; then + functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-rocky-(noha|ha)/\1-nofeature-\2/p') + echo "DOCKER_TAG=hunter" > functest_scenario + elif [[ "$features" =~ 'rocky' ]]; then + functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_rocky-(noha|ha)/\1-\2-\3/p') + echo "DOCKER_TAG=hunter" > functest_scenario else functest_scenario=$DEPLOY_SCENARIO + echo "DOCKER_TAG=''" > functest_scenario fi - echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties + echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario - inject: - properties-file: functest_properties + properties-file: functest_scenario override-build-parameters: true - multijob: name: 'OPNFV Test Suite' @@ -456,8 +445,9 @@ - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true current-parameters: false - predefined-parameters: + predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: true git-revision: false @@ -498,6 +488,10 @@ name: DEPLOY_SCENARIO default: '{scenario}' description: "Scenario to deploy with." + - string: + name: DOCKER_TAG + default: '' + description: Default docker tag to pass to functest properties: - logrotate-default @@ -526,6 +520,7 @@ current-parameters: false predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: false git-revision: false @@ -731,7 +726,7 @@ description: "Used for overriding the PROMOTE" - string: name: GS_URL - default: $GS_BASE{gs-pathname}/{os_version}/{topology} + default: 'artifacts.opnfv.org/apex/{os_version}/{topology}' description: "User for overriding GS_URL from apex params" - string: name: OS_VERSION @@ -741,7 +736,10 @@ name: ODL_BRANCH default: '{odl_branch}' description: ODL branch being used - + - string: + name: FORCE_PROMOTE + default: 'False' + description: "Used to force promotion and skip CSIT" properties: - build-blocker: use-build-blocker: true @@ -801,6 +799,7 @@ SSH_KEY_PATH=/tmp/csit/id_rsa ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION + SKIP_CSIT=$FORCE_PROMOTE node-parameters: true kill-phase-on: NEVER abort-all-job: false @@ -1210,12 +1209,12 @@ - trigger: name: 'master-master' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-rocky' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-queens' @@ -1235,7 +1234,7 @@ - trigger: name: 'gambia-queens' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'fraser-master' diff --git a/jjb/armband/armband-rtd-jobs.yaml b/jjb/armband/armband-rtd-jobs.yaml new file mode 100644 index 000000000..be3d8939d --- /dev/null +++ b/jjb/armband/armband-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: armband-rtd + project: armband + project-name: armband + + project-pattern: 'armband' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-armband/47349/' + rtd-token: 'b8f7de9a1f2baf063ccc6afb52dbc8e6308b6ab5' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/auto/auto-rtd-jobs.yaml b/jjb/auto/auto-rtd-jobs.yaml new file mode 100644 index 000000000..1eca3afd4 --- /dev/null +++ b/jjb/auto/auto-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: auto-rtd + project: auto + project-name: auto + + project-pattern: 'auto' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-auto/47350/' + rtd-token: '3c2277762678c97e59d24c83201194d6b56d7983' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/availability/availability-rtd-jobs.yaml b/jjb/availability/availability-rtd-jobs.yaml new file mode 100644 index 000000000..d63bb9ee9 --- /dev/null +++ b/jjb/availability/availability-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: availability-rtd + project: availability + project-name: availability + + gerrit-skip-vote: true + project-pattern: 'availability' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-availability/47351/' + rtd-token: '3ae514b14073e1eacb697d3eddee62a26c8c891c' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/barometer/barometer-rtd-jobs.yaml b/jjb/barometer/barometer-rtd-jobs.yaml new file mode 100644 index 000000000..1b647dbb9 --- /dev/null +++ b/jjb/barometer/barometer-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: barometer-rtd + project: barometer + project-name: barometer + + project-pattern: 'barometer' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-barometer/47353/' + rtd-token: 'aef70b8a0148b295e25dd92474110bcd622bacb0' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yaml b/jjb/bottlenecks/bottlenecks-ci-jobs.yaml index 4c302dd52..0a48eedf5 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yaml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yaml @@ -19,8 +19,8 @@ gs-packagepath: '/{suite}' # docker tag used for version control docker-tag: 'latest' - fraser: &fraser - stream: fraser + gambia: &gambia + stream: gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' gs-packagepath: '/{stream}/{suite}' @@ -49,12 +49,12 @@ slave-label: compass-baremetal-branch installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *gambia - virtual: slave-label: compass-virtual-branch installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *gambia # ------------------------------- # None-CI PODs diff --git a/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml b/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml new file mode 100644 index 000000000..27b883bd2 --- /dev/null +++ b/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: bottlenecks-rtd + project: bottlenecks + project-name: bottlenecks + + gerrit-skip-vote: true + project-pattern: 'bottlenecks' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-bottlenecks/47355/' + rtd-token: '95dd0dbdde4a219b5196ffb86e15401b7b927885' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/calipso/calipso-rtd-jobs.yaml b/jjb/calipso/calipso-rtd-jobs.yaml new file mode 100644 index 000000000..e6b61d768 --- /dev/null +++ b/jjb/calipso/calipso-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: calipso-rtd + project: calipso + project-name: calipso + + gerrit-skip-vote: true + project-pattern: 'calipso' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-calipso/47356/' + rtd-token: '9b88e25a769998fc316b25efe15eca2b7c1474f4' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/clover/clover-rtd-jobs.yaml b/jjb/clover/clover-rtd-jobs.yaml new file mode 100644 index 000000000..4e773c29a --- /dev/null +++ b/jjb/clover/clover-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: clover-rtd + project: clover + project-name: clover + + gerrit-skip-vote: true + project-pattern: 'clover' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-clover/47357/' + rtd-token: '8b47c0a3c1cfe7de885bf217628b58dd91f14f2e' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml b/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml new file mode 100644 index 000000000..974ec6e63 --- /dev/null +++ b/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: compass4nfv-rtd + project: compass4nfv + project-name: compass4nfv + + gerrit-skip-vote: true + project-pattern: 'compass4nfv' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-compass4nfv/47358/' + rtd-token: '4208e8492be2e4eab7f18f1e70b5d78247d1b249' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/container4nfv/container4nfv-rtd-jobs.yaml b/jjb/container4nfv/container4nfv-rtd-jobs.yaml new file mode 100644 index 000000000..0a008b417 --- /dev/null +++ b/jjb/container4nfv/container4nfv-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: container4nfv-rtd + project: container4nfv + project-name: container4nfv + + gerrit-skip-vote: true + project-pattern: 'container4nfv' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-container4nfv/47359/' + rtd-token: '82f917a788d006dc15df14ecd3c991115490bf8a' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/copper/copper-rtd-jobs.yaml b/jjb/copper/copper-rtd-jobs.yaml new file mode 100644 index 000000000..6198d2211 --- /dev/null +++ b/jjb/copper/copper-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: copper-rtd + project: copper + project-name: copper + + gerrit-skip-vote: true + project-pattern: 'copper' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-copper/47360/' + rtd-token: '1b423ddc3af602f8078c1ece0d689e0b4d3c3f79' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index abd62a39d..892f0aa7a 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -4,6 +4,11 @@ set -o errexit set -o nounset set -o pipefail +if [[ ! -z ${SKIP_CSIT+x} && "$SKIP_CSIT" == "True" ]]; then + echo "Skipping csit run" + exit 0 +fi + if [ "$OS_VERSION" == 'master' ]; then FULL_OS_VER='master' else diff --git a/jjb/daisy4nfv/daisy-rtd-jobs.yaml b/jjb/daisy4nfv/daisy-rtd-jobs.yaml new file mode 100644 index 000000000..59c66a952 --- /dev/null +++ b/jjb/daisy4nfv/daisy-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: daisy-rtd + project: daisy + project-name: daisy + + gerrit-skip-vote: true + project-pattern: 'daisy' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-daisy/47361/' + rtd-token: '265efe14ff0bb3fa0d4ea66d6be1b7b511d5d713' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/doctor/doctor-rtd-jobs.yaml b/jjb/doctor/doctor-rtd-jobs.yaml new file mode 100644 index 000000000..1693a6f3a --- /dev/null +++ b/jjb/doctor/doctor-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: doctor-rtd + project: doctor + project-name: doctor + + gerrit-skip-vote: true + project-pattern: 'doctor' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-doctor/47362/' + rtd-token: 'bf8640556a3ba3151e4e5602facc5ed982dd88c8' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index 2d5fe0ef2..5b4c4b06f 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -6,9 +6,6 @@ project-name: '{name}' project-pattern: '{project}' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-doctor/47214/' - rtd-token: '13264f62c1a044e39e9aed22a0dc1853d5a0b196' - stream: - master: branch: '{stream}' @@ -51,7 +48,6 @@ - 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}' - 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}' - 'doctor-verify-all-{installer}-{inspector}-{arch}-{stream}' - - '{project-name}-rtd-jobs' - job-template: name: 'doctor-verify-{stream}' @@ -98,7 +94,11 @@ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE git-revision: true - - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}' + - multijob: + name: 'doctor-verify-congress' + execution-type: PARALLEL + projects: + - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -108,10 +108,10 @@ kill-phase-on: FAILURE git-revision: true - multijob: - name: 'doctor-verify-congress' + name: 'doctor-verify-sample-all' execution-type: PARALLEL projects: - - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}' + - name: 'doctor-verify-all-apex-sample-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -121,10 +121,6 @@ kill-phase-on: FAILURE git-revision: true - multijob: - name: 'doctor-verify-sample-all' - execution-type: PARALLEL - # This would be for running all test cases with sample inspector - - multijob: name: 'doctor-verify-congress-all' execution-type: PARALLEL # This would be for running all test cases with congress inspector diff --git a/jjb/domino/domino-rtd-jobs.yaml b/jjb/domino/domino-rtd-jobs.yaml new file mode 100644 index 000000000..26f254760 --- /dev/null +++ b/jjb/domino/domino-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: domino-rtd + project: domino + project-name: domino + + gerrit-skip-vote: true + project-pattern: 'domino' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-domino/47363/' + rtd-token: 'c89c7fc281d94a985df61b49be2b824f544ba6fd' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml index e3b87c7cb..02a33ccdb 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yaml +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -26,6 +26,12 @@ dovetail-branch: 'stable/{stream}' gs-pathname: '/{stream}' docker-tag: 'ovp-2.0.0' + gambia: &gambia + stream: gambia + branch: 'stable/{stream}' + dovetail-branch: 'master' + gs-pathname: '/{stream}' + docker-tag: 'latest' # ---------------------------------- # POD, PLATFORM, AND BRANCH MAPPING @@ -81,6 +87,16 @@ SUT: compass auto-trigger-name: 'daily-trigger-disabled' <<: *fraser + - baremetal: + slave-label: compass-baremetal + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia + - virtual: + slave-label: compass-virtual + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia # ------------------------------- # Installers not using labels # CI PODs diff --git a/jjb/dovetail/dovetail-rtd-jobs.yaml b/jjb/dovetail/dovetail-rtd-jobs.yaml new file mode 100644 index 000000000..482ff4673 --- /dev/null +++ b/jjb/dovetail/dovetail-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: dovetail-rtd + project: dovetail + project-name: dovetail + + project-pattern: 'dovetail' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-dovetail/47364/' + rtd-token: '47df9d7358b153666c2cf5cc139cd3a65d135688' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 5fe3d36bb..04b11fdd1 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -29,6 +29,7 @@ mkdir -p ${DOVETAIL_IMAGES} OPENRC=${DOVETAIL_CONFIG}/env_config.sh CACERT=${DOVETAIL_CONFIG}/os_cacert +POD=${DOVETAIL_CONFIG}/pod.yaml ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" @@ -36,9 +37,9 @@ sshkey="" check_file_exists() { if [[ -f $1 ]]; then - return 0 + echo 0 else - return 1 + echo 1 fi } @@ -91,8 +92,12 @@ get_joid_cred_file() { } change_cred_file_cacert_path() { - check_file_exists ${CACERT} - if [[ $? == 0 ]]; then + if [[ ${INSTALLER_TYPE} == "apex" ]]; then + echo "INFO: apex doesn't need to set OS_CACERT." + return 0 + fi + exists=`check_file_exists ${CACERT}` + if [[ $exists == 0 ]]; then echo "INFO: set ${INSTALLER_TYPE} openstack cacert file to be ${CACERT}" if [[ ${INSTALLER_TYPE} == "compass" ]]; then echo "export OS_CACERT=${CACERT}" >> ${OPENRC} @@ -100,18 +105,18 @@ change_cred_file_cacert_path() { sed -i "s#/etc/ssl/certs/mcp_os_cacert#${CACERT}#g" ${OPENRC} fi else - echo "ERROR: cannot find file $OPENRC. Please check if it is existing." + echo "ERROR: cannot find file ${CACERT}. Please check if it exists." sudo ls -al ${DOVETAIL_CONFIG} exit 1 fi } change_cred_file_ext_net() { - check_file_exists ${OPENRC} - if [[ $? == 0 ]]; then + exists=`check_file_exists ${OPENRC}` + if [[ $exists == 0 ]]; then echo "export EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" >> ${OPENRC} else - echo "ERROR: cannot find file $OPENRC. Please check if it is existing." + echo "ERROR: cannot find file $OPENRC. Please check if it exists." sudo ls -al ${DOVETAIL_CONFIG} exit 1 fi @@ -128,32 +133,26 @@ get_cred_file() { get_joid_cred_file fi - check_file_exists ${OPENRC} - if [[ $? == 0 ]]; then - echo "INFO: original openstack credentials file is" + exists=`check_file_exists ${OPENRC}` + if [[ $exists == 0 ]]; then + echo "INFO: original openstack credentials file is:" cat $OPENRC echo "INFO: change cacert file path in credentials file" change_cred_file_cacert_path echo "INFO: set external network in credentials file" change_cred_file_ext_net - echo "INFO: final openstack credentials file is" + echo "INFO: final openstack credentials file is:" cat $OPENRC else - echo "ERROR: cannot find file $OPENRC. Please check if it is existing." + echo "ERROR: cannot find file $OPENRC. Please check if it exists." sudo ls -al ${DOVETAIL_CONFIG} exit 1 fi } -get_cred_file - -# These packages are used for parsing yaml files and decrypting ipmi user and password. -sudo pip install shyaml -sudo yum install -y rubygems || sudo apt-get install -y ruby -sudo gem install hiera-eyaml - -if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "compass" ]]; then +get_compass_pod_file() { compass_repo=${WORKSPACE}/compass4nfv/ + echo "INFO: clone compass repo..." git clone https://github.com/opnfv/compass4nfv.git ${compass_repo} >/dev/null scenario_file=${compass_repo}/deploy/conf/hardware_environment/$NODE_NAME/os-nosdn-nofeature-ha.yml ipmiIp=$(cat ${scenario_file} | shyaml get-value hosts.0.ipmiIp) @@ -161,7 +160,7 @@ if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "compass" ]]; then ipmiUser=root jumpserver_ip=$(ifconfig | grep -A 5 docker0 | grep "inet addr" | cut -d ':' -f 2 | cut -d ' ' -f 1) - cat << EOF >${DOVETAIL_CONFIG}/pod.yaml + cat << EOF >${POD} nodes: - {ip: ${jumpserver_ip}, name: node0, password: root, role: Jumpserver, user: root} - {ip: 10.1.0.50, name: node1, password: root, role: controller, user: root, @@ -172,9 +171,10 @@ nodes: - {ip: 10.1.0.54, name: node5, password: root, role: compute, user: root} EOF -fi -if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then +} + +get_fuel_baremetal_pod_file() { fuel_ctl_ssh_options="${ssh_options} -i ${SSH_KEY}" ssh_user="ubuntu" fuel_ctl_ip=$(ssh 2>/dev/null ${fuel_ctl_ssh_options} "${ssh_user}@${INSTALLER_IP}" \ @@ -202,7 +202,7 @@ if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_T [[ $ipmiUser == ENC* ]] && ipmiUser=$(eyaml decrypt -s ${ipmiUser//[[:blank:]]/}) [[ $ipmiPass == ENC* ]] && ipmiPass=$(eyaml decrypt -s ${ipmiPass//[[:blank:]]/}) - cat << EOF >${DOVETAIL_CONFIG}/pod.yaml + cat << EOF >${POD} nodes: - {ip: ${INSTALLER_IP}, name: node0, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: Jumpserver, user: ${ssh_user}} @@ -212,11 +212,10 @@ nodes: - {ip: ${fuel_cmp_ip}, name: cmp01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}} - {ip: ${fuel_dbs_ip}, name: dbs01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}} EOF -fi +} -if [[ ! -f ${DOVETAIL_CONFIG}/pod.yaml ]]; then +get_pod_file_with_scripts() { set +e - sudo pip install virtualenv cd ${releng_repo}/modules @@ -228,60 +227,95 @@ if [[ ! -f ${DOVETAIL_CONFIG}/pod.yaml ]]; then if [[ ${INSTALLER_TYPE} == compass ]]; then options="-u root -p root" elif [[ ${INSTALLER_TYPE} == fuel ]]; then - options="-u root -p r00tme" + options="-u ubuntu -k /root/.ssh/id_rsa" elif [[ ${INSTALLER_TYPE} == apex ]]; then options="-u stack -k /root/.ssh/id_rsa" elif [[ ${INSTALLER_TYPE} == daisy ]]; then options="-u root -p r00tme" else - echo "Don't support to generate pod.yaml on ${INSTALLER_TYPE} currently." - echo "HA test cases may not run properly." + echo "WARNING: Don't support to generate ${POD} on ${INSTALLER_TYPE} currently." + echo "WARNING: HA test cases may not run properly." fi cmd="sudo python ${releng_repo}/utils/create_pod_file.py -t ${INSTALLER_TYPE} \ - -i ${INSTALLER_IP} ${options} -f ${DOVETAIL_CONFIG}/pod.yaml \ + -i ${INSTALLER_IP} ${options} -f ${POD} \ -s /home/opnfv/userconfig/pre_config/id_rsa" - echo ${cmd} + echo "INFO: cmd is ${cmd}" ${cmd} deactivate - set -e - cd ${WORKSPACE} -fi +} -if [ -f ${DOVETAIL_CONFIG}/pod.yaml ]; then - sudo chmod 666 ${DOVETAIL_CONFIG}/pod.yaml - echo "Adapt process info for $INSTALLER_TYPE ..." - if [ "$INSTALLER_TYPE" == "apex" ]; then - cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml +change_apex_pod_file_process_info() { + cat << EOF >> ${POD} process_info: - {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq_server} - {testcase_name: yardstick.ha.cinder_api, attack_process: cinder_wsgi} EOF - elif [ "$INSTALLER_TYPE" == "fuel" ]; then - cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml +} + +change_fuel_pod_file_process_info() { + cat << EOF >> ${POD} process_info: - {testcase_name: yardstick.ha.cinder_api, attack_process: cinder-wsgi} - {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq_server, attack_host: msg01} - {testcase_name: yardstick.ha.neutron_l3_agent, attack_process: neutron-l3-agent, attack_host: cmp01} - {testcase_name: yardstick.ha.database, attack_process: mysqld, attack_host: dbs01} EOF - elif [ "$INSTALLER_TYPE" == "compass" ]; then - cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml +} + +change_compass_pod_file_process_info() { + cat << EOF >> ${POD} process_info: - {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq} EOF +} + +change_pod_file_process_info() { + sudo chmod 666 ${POD} + echo "INFO: adapt process info for $INSTALLER_TYPE ..." + if [ "$INSTALLER_TYPE" == "apex" ]; then + change_apex_pod_file_process_info + elif [ "$INSTALLER_TYPE" == "fuel" ]; then + change_fuel_pod_file_process_info + elif [ "$INSTALLER_TYPE" == "compass" ]; then + change_compass_pod_file_process_info fi +} - echo "file ${DOVETAIL_CONFIG}/pod.yaml:" - cat ${DOVETAIL_CONFIG}/pod.yaml -else - echo "Error: cannot find file ${DOVETAIL_CONFIG}/pod.yaml. Please check if it is existing." - sudo ls -al ${DOVETAIL_CONFIG} - echo "HA test cases may not run properly." -fi +get_pod_file() { + # These packages are used for parsing yaml files and decrypting ipmi user and password. + sudo pip install shyaml + sudo yum install -y rubygems || sudo apt-get install -y ruby + sudo gem install hiera-eyaml + if [[ ${INSTALLER_TYPE} == 'compass' ]]; then + get_compass_pod_file + elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then + get_fuel_baremetal_pod_file + fi + + exists=`check_file_exists ${POD}` + if [[ $exists == 1 ]]; then + get_pod_file_with_scripts + fi + + exists=`check_file_exists ${POD}` + if [[ $exists == 0 ]]; then + change_pod_file_process_info + else + echo "ERROR: cannot find file ${POD}. Please check if it exists." + sudo ls -al ${DOVETAIL_CONFIG} + exit 1 + fi + + echo "INFO: file ${POD} is:" + cat ${POD} +} + +get_cred_file +get_pod_file if [ "$INSTALLER_TYPE" == "fuel" ]; then if [[ "${SUT_BRANCH}" =~ "danube" ]]; then @@ -376,7 +410,7 @@ sleep 5 container_id=$(docker ps | grep "${DOCKER_REPO}:${DOCKER_TAG}" | awk '{print $1}' | head -1) echo "Container ID=${container_id}" if [ -z ${container_id} ]; then - echo "Cannot find ${DOCKER_REPO} container ID ${container_id}. Please check if it is existing." + echo "Cannot find ${DOCKER_REPO} container ID ${container_id}. Please check if it exists." docker ps -a exit 1 fi diff --git a/jjb/escalator/escalator-rtd-jobs.yaml b/jjb/escalator/escalator-rtd-jobs.yaml new file mode 100644 index 000000000..762051c96 --- /dev/null +++ b/jjb/escalator/escalator-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: escalator-rtd + project: escalator + project-name: escalator + + gerrit-skip-vote: true + project-pattern: 'escalator' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-escalator/47365/' + rtd-token: 'cb75c70dab564cb40e6d9e8f2a99ced96f5b79b1' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/fds/fds-rtd-jobs.yaml b/jjb/fds/fds-rtd-jobs.yaml new file mode 100644 index 000000000..9bf47b956 --- /dev/null +++ b/jjb/fds/fds-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: fds-rtd + project: fds + project-name: fds + + project-pattern: 'fds' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-fds/47367/' + rtd-token: '756989c50a7c8f3350c4943f3d39a73762a4cd85' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index c0cdc3dc2..e66dbe1bd 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -19,6 +19,9 @@ LAB_NAME=${NODE_NAME/-*} # shellcheck disable=SC2153 POD_NAME=${NODE_NAME/*-} +# define Docker tag for stable branches +[[ "${BRANCH}" != master ]] && export MCP_DOCKER_TAG=${BRANCH##*/} + # Fuel currently supports arm, enea, ericsson, intel, lf, unh and zte labs if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte) ]]; then echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!" diff --git a/jjb/fuel/fuel-project-jobs.yaml b/jjb/fuel/fuel-project-jobs.yaml index 400b1552c..f424c2014 100644 --- a/jjb/fuel/fuel-project-jobs.yaml +++ b/jjb/fuel/fuel-project-jobs.yaml @@ -18,11 +18,3 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - project-name: '{project}' - project-pattern: '{project}' - rtd-build-url: https://readthedocs.org/api/v2/webhook/opnfv-fuel/47205/ - rtd-token: 38f40bf6c08fd4bccb930871bc29b08404cf98b0 - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index da167358a..465d91efe 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -8,6 +8,7 @@ REPO=${REPO:-opnfv} CI_LOOP=${CI_LOOP:-daily} TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources +DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})} check_os_deployment() { FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} @@ -42,6 +43,7 @@ run_tiers() { echo ${ret_value} > ${ret_val_file} if [ ${tier} == 'healthcheck' ]; then echo "Healthcheck tier failed. Exiting Functest..." + skip_tests=1 break fi fi @@ -87,7 +89,6 @@ FUNCTEST_DIR=/home/opnfv/functest DEPLOY_TYPE=baremetal [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt HOST_ARCH=$(uname -m) -DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/}` # Prepare OpenStack credentials volume rc_file=${HOME}/opnfv-openrc.sh @@ -131,12 +132,11 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" - if [ "${INSTALLER_TYPE}" == 'fuel' ]; then COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \ "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'") IMAGE_PROPERTIES="hw_disk_bus:scsi,hw_scsi_model:virtio-scsi" - envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES}" + envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}" fi if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-noha' ]]; then @@ -156,15 +156,99 @@ fi if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then if [[ -n ${IMAGE_PROPERTIES} ]]; then - IMAGE_PROPERTIES="${IMAGE_PROPERTIES}, hw_mem_page_size: large" + IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large" else - IMAGE_PROPERTIES="hw_mem_page_size: large" + IMAGE_PROPERTIES="hw_mem_page_size:large" fi - FLAVOR_EXTRA_SPECS="hw:mem_page_size: large" - envs="${envs} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\" -e FLAVOR_EXTRA_SPECS=\"${FLAVOR_EXTRA_SPECS}\"" + FLAVOR_EXTRA_SPECS="hw:mem_page_size:large" +fi + +if [[ -n ${IMAGE_PROPERTIES} ]] || [[ -n ${FLAVOR_EXTRA_SPECS} ]]; then + envs="${envs} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES} -e FLAVOR_EXTRA_SPECS=${FLAVOR_EXTRA_SPECS}" fi -volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" +tempest_conf_yaml=$(mktemp) +case ${INSTALLER_TYPE} in +apex) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: true +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: ceph +volume-feature-enabled: + backup: false +EOF + ;; +compass) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: false + spice_console: true +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: ceph +volume-feature-enabled: + backup: false +EOF + ;; +fuel) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: false + spice_console: true +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: iSCSI +volume-feature-enabled: + backup: false +EOF + ;; +*) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: false +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: iSCSI +volume-feature-enabled: + backup: false +EOF + ;; +esac +echo "tempest_conf.yaml:" && cat "${tempest_conf_yaml}" + +volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} \ + ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol} \ + -v ${tempest_conf_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -180,6 +264,7 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then run_tiers ${tiers} else tests=(tempest_full tempest_scenario) + skip_tests=0 if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) @@ -196,7 +281,9 @@ else fi fi run_tiers ${tiers} - for test in "${tests[@]}"; do - run_test "$test" - done + if [ ${skip_tests} -eq 0 ]; then + for test in "${tests[@]}"; do + run_test "$test" + done + fi fi diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 27cd0ac26..34aee8a9d 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -102,6 +102,18 @@ slave-label: compass-arm-virtual installer: compass <<: *fraser + - baremetal: + slave-label: compass-baremetal + installer: compass + <<: *gambia + - virtual: + slave-label: compass-virtual + installer: compass + <<: *gambia + - arm-virtual: + slave-label: compass-arm-virtual + installer: compass + <<: *gambia # apex CI PODs - virtual: slave-label: apex-virtual-master @@ -112,6 +124,14 @@ installer: apex <<: *master - virtual: + slave-label: apex-virtual-master + installer: apex + <<: *gambia + - baremetal: + slave-label: apex-baremetal-master + installer: apex + <<: *gambia + - virtual: slave-label: apex-virtual-fraser installer: apex <<: *fraser @@ -272,6 +292,9 @@ name: DEPLOY_SCENARIO default: 'os-nosdn-nofeature-noha' - string: + name: DOCKER_TAG + default: '' + - string: name: CLEAN_DOCKER_IMAGES default: 'false' description: 'Remove downloaded docker images (opnfv/functest*:*)' diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index b7220a83c..e9a65b495 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -114,7 +114,7 @@ wrappers: - ssh-agent-wrapper - build-timeout: - timeout: 30 + timeout: 60 parameters: - project-parameter: diff --git a/jjb/functest/functest-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml new file mode 100644 index 000000000..e45338262 --- /dev/null +++ b/jjb/functest/functest-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: functest-rtd + project: functest + project-name: functest + + gerrit-skip-vote: true + project-pattern: 'functest' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-functest/47369/' + rtd-token: '26f9131bd5c337928ba8b431a289f6850b330504' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/ipv6/ipv6-rtd-jobs.yaml b/jjb/ipv6/ipv6-rtd-jobs.yaml new file mode 100644 index 000000000..7a677cee9 --- /dev/null +++ b/jjb/ipv6/ipv6-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: ipv6-rtd + project: ipv6 + project-name: ipv6 + + gerrit-skip-vote: true + project-pattern: 'ipv6' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ipv6/47370/' + rtd-token: 'e7abb4e2c3f3f0dfc1a8feefe39b27f4a4f9b98a' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/joid/joid-rtd-jobs.yaml b/jjb/joid/joid-rtd-jobs.yaml new file mode 100644 index 000000000..14d171ca9 --- /dev/null +++ b/jjb/joid/joid-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: joid-rtd + project: joid + project-name: joid + + project-pattern: 'joid' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-joid/47371/' + rtd-token: '44a666161d99c9f53e7f69e56f1704694502015b' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/kvmfornfv/kvmfornfv-rtd-jobs.yaml b/jjb/kvmfornfv/kvmfornfv-rtd-jobs.yaml new file mode 100644 index 000000000..7d0b925a5 --- /dev/null +++ b/jjb/kvmfornfv/kvmfornfv-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: kvmfornfv-rtd + project: kvmfornfv + project-name: kvmfornfv + + gerrit-skip-vote: true + project-pattern: 'kvmfornfv' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-kvmfornfv/47372/' + rtd-token: '32ae6f0ad54181a27fd38d99821a021f5087554a' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/moon/moon-rtd-jobs.yaml b/jjb/moon/moon-rtd-jobs.yaml new file mode 100644 index 000000000..9d5f3c345 --- /dev/null +++ b/jjb/moon/moon-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: moon-rtd + project: moon + project-name: moon + + gerrit-skip-vote: true + project-pattern: 'moon' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-moon/47373/' + rtd-token: 'f4dc698744431a8688a58746f84fc5d7bee694b2' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/multisite/multisite-rtd-jobs.yaml b/jjb/multisite/multisite-rtd-jobs.yaml new file mode 100644 index 000000000..4e7f9e579 --- /dev/null +++ b/jjb/multisite/multisite-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: multisite-rtd + project: multisite + project-name: multisite + + project-pattern: 'multisite' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-multisite/47374/' + rtd-token: '5d5b5c20e10df51eec38593b76d96cd22d4f1a96' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/netready/netready-rtd-jobs.yaml b/jjb/netready/netready-rtd-jobs.yaml new file mode 100644 index 000000000..ce46b33bc --- /dev/null +++ b/jjb/netready/netready-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: netready-rtd + project: netready + project-name: netready + + gerrit-skip-vote: true + project-pattern: 'netready' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-netready/47375/' + rtd-token: '3defd5720db87d5fd6487702e2778053b9279c28' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/nfvbench/nfvbench-rtd-jobs.yaml b/jjb/nfvbench/nfvbench-rtd-jobs.yaml new file mode 100644 index 000000000..56fda70ec --- /dev/null +++ b/jjb/nfvbench/nfvbench-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: nfvbench-rtd + project: nfvbench + project-name: nfvbench + + project-pattern: 'nfvbench' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-nfvbench/47376/' + rtd-token: '7d77b15615ffe7906f1f20e245c80dc0a0f97e47' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/octopus/octopus-rtd-jobs.yaml b/jjb/octopus/octopus-rtd-jobs.yaml new file mode 100644 index 000000000..068ff3b57 --- /dev/null +++ b/jjb/octopus/octopus-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: octopus-rtd + project: octopus + project-name: octopus + + gerrit-skip-vote: true + project-pattern: 'octopus' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-octopus/47377/' + rtd-token: 'b3a1784dc55db91f38ea54cb181a0e4551221349' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/onosfw/onosfw-rtd-jobs.yaml b/jjb/onosfw/onosfw-rtd-jobs.yaml new file mode 100644 index 000000000..a7a5e737a --- /dev/null +++ b/jjb/onosfw/onosfw-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: onosfw-rtd + project: onosfw + project-name: onosfw + + gerrit-skip-vote: true + project-pattern: 'onosfw' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-onosfw/47378/' + rtd-token: '1ad406bcdf2d627e2e18fbcd6605f3456b05bb3d' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/opera/opera-rtd-jobs.yaml b/jjb/opera/opera-rtd-jobs.yaml new file mode 100644 index 000000000..b923c9f81 --- /dev/null +++ b/jjb/opera/opera-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: opera-rtd + project: opera + project-name: opera + + gerrit-skip-vote: true + project-pattern: 'opera' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-opera/47379/' + rtd-token: '4dc678d2d96adf6376b4f8f9aafdbbeb24dbb006' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index 1492a68ff..b4b85f6a0 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -8,12 +8,12 @@ stream: - master: branch: 'master' + - gambia: + branch: 'stable/{stream}' - fraser: branch: 'stable/{stream}' - danube: branch: 'stable/{stream}' - - euphrates: - branch: 'stable/{stream}' project: 'opnfvdocs' rtdproject: 'opnfv' @@ -86,7 +86,12 @@ builders: - shell: | if [ "$GERRIT_PROJECT" != "opnfvdocs" ]; then - cd docs/submodules/$GERRIT_PROJECT + # Temporary hacky solution to handle local builds for projects + # that already moved away from submodules + if ! cd docs/submodules/$GERRIT_PROJECT 2 > /dev/null; then + rm -rf .* * 2 > /dev/null + git clone ${{GIT_BASE/opnfvdocs/$GERRIT_PROJECT}} . + fi git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD cd - else diff --git a/jjb/opnfvdocs/opnfvdocs.yaml b/jjb/opnfvdocs/opnfvdocs.yaml index 5f08f69a4..a97457353 100644 --- a/jjb/opnfvdocs/opnfvdocs.yaml +++ b/jjb/opnfvdocs/opnfvdocs.yaml @@ -17,11 +17,11 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: &fraser + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/opnfvtsc/opnfvtsc-rtd-jobs.yaml b/jjb/opnfvtsc/opnfvtsc-rtd-jobs.yaml new file mode 100644 index 000000000..b1923f458 --- /dev/null +++ b/jjb/opnfvtsc/opnfvtsc-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: opnfvtsc-rtd + project: opnfvtsc + project-name: opnfvtsc + + gerrit-skip-vote: true + project-pattern: 'opnfvtsc' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-opnfvtsc/47400/' + rtd-token: 'b8cbc26c46f1b1bd98adbf8c4488787a58d68fdd' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/orchestra/orchestra-rtd-jobs.yaml b/jjb/orchestra/orchestra-rtd-jobs.yaml new file mode 100644 index 000000000..d1279eba4 --- /dev/null +++ b/jjb/orchestra/orchestra-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: orchestra-rtd + project: orchestra + project-name: orchestra + + gerrit-skip-vote: true + project-pattern: 'orchestra' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-orchestra/47380/' + rtd-token: 'c7f8cb2949a592bf6040c648552b0afa61f7da15' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/ovno/ovno-rtd-jobs.yaml b/jjb/ovno/ovno-rtd-jobs.yaml new file mode 100644 index 000000000..c5d661dca --- /dev/null +++ b/jjb/ovno/ovno-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: ovno-rtd + project: ovno + project-name: ovno + + gerrit-skip-vote: true + project-pattern: 'ovno' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ovno/47382/' + rtd-token: 'd393a62c6ee0b06979d0bb28f0b43e88208ce2c1' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/ovsnfv/ovsnfv-rtd-jobs.yaml b/jjb/ovsnfv/ovsnfv-rtd-jobs.yaml new file mode 100644 index 000000000..ecbcecae3 --- /dev/null +++ b/jjb/ovsnfv/ovsnfv-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: ovsnfv-rtd + project: ovsnfv + project-name: ovsnfv + + gerrit-skip-vote: true + project-pattern: 'ovsnfv' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ovsnfv/47383/' + rtd-token: '1faa400aa3da4eca3c6018f8ed0e48a33fa66a00' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/parser/parser-rtd-jobs.yaml b/jjb/parser/parser-rtd-jobs.yaml new file mode 100644 index 000000000..df880f22b --- /dev/null +++ b/jjb/parser/parser-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: parser-rtd + project: parser + project-name: parser + + project-pattern: 'parser' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-parser/47384/' + rtd-token: '10223af1183fc8bdc191932045d82a0c1d7c874a' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/pharos/pharos-rtd-jobs.yaml b/jjb/pharos/pharos-rtd-jobs.yaml new file mode 100644 index 000000000..60bcd8a00 --- /dev/null +++ b/jjb/pharos/pharos-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: pharos-rtd + project: pharos + project-name: pharos + + project-pattern: 'pharos' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-pharos/47385/' + rtd-token: '12cb789478d0c3577fb62c610232b3113d3a16ad' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/promise/promise-rtd-jobs.yaml b/jjb/promise/promise-rtd-jobs.yaml new file mode 100644 index 000000000..427e7417b --- /dev/null +++ b/jjb/promise/promise-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: promise-rtd + project: promise + project-name: promise + + gerrit-skip-vote: true + project-pattern: 'promise' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-promise/47386/' + rtd-token: 'e689330ddc9401d83dd26efbe26a55a6ecd33a0d' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/qtip/qtip-rtd-jobs.yaml b/jjb/qtip/qtip-rtd-jobs.yaml new file mode 100644 index 000000000..4af5997ba --- /dev/null +++ b/jjb/qtip/qtip-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: qtip-rtd + project: qtip + project-name: qtip + + gerrit-skip-vote: true + project-pattern: 'qtip' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-qtip/47387/' + rtd-token: 'eb407b024fbe12c416d012f48db866caf5fbab7c' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml index 7cedba916..2eb2a207c 100644 --- a/jjb/releng/compass4nfv-docker.yaml +++ b/jjb/releng/compass4nfv-docker.yaml @@ -198,14 +198,16 @@ #!/bin/bash -ex case "{stream}" in "master") - tag="latest" ;; + sudo manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template opnfv/compass-{image}:ARCH-latest \ + --target opnfv/compass-{image}:latest ;; *) - tag="{stream}" ;; + sudo manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template opnfv/compass-{image}:ARCH-stable \ + --target opnfv/compass-{image}:{stream} ;; esac - sudo manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template opnfv/compass-{image}:ARCH-$tag \ - --target opnfv/compass-{image}:$tag exit $? # parameter macro @@ -256,9 +258,7 @@ publishers: - email: recipients: > - chigang@huawei.com - huangxiangyui5@huawei.com - xueyifei@huawei.com + huangxiangyu5@huawei.com wutianwei1@huawei.com - publisher: diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml index 457f7dc2b..05ffd51d9 100644 --- a/jjb/releng/opnfv-utils.yaml +++ b/jjb/releng/opnfv-utils.yaml @@ -168,6 +168,7 @@ sudo apt-get -y install ansible fi + - builder: name: run-ansible-build-server-playbook builders: diff --git a/jjb/releng/releng-ci-jobs.yaml b/jjb/releng/releng-rtd-jobs.yaml index f7c960335..f7c960335 100644 --- a/jjb/releng/releng-ci-jobs.yaml +++ b/jjb/releng/releng-rtd-jobs.yaml diff --git a/jjb/samplevnf/samplevnf-rtd-jobs.yaml b/jjb/samplevnf/samplevnf-rtd-jobs.yaml new file mode 100644 index 000000000..9c09c827e --- /dev/null +++ b/jjb/samplevnf/samplevnf-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: samplevnf-rtd + project: samplevnf + project-name: samplevnf + + gerrit-skip-vote: true + project-pattern: 'samplevnf' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-samplevnf/47390/' + rtd-token: '133bd533bd10428c549c17967469b25e847f42f4' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml b/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml new file mode 100644 index 000000000..f5cc81937 --- /dev/null +++ b/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: sdnvpn-rtd + project: sdnvpn + project-name: sdnvpn + + project-pattern: 'sdnvpn' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-sdnvpn/47391/' + rtd-token: '1efdc48a9819be55a28137937674f1f744d02fe0' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/sfc/sfc-rtd-jobs.yaml b/jjb/sfc/sfc-rtd-jobs.yaml new file mode 100644 index 000000000..42b200427 --- /dev/null +++ b/jjb/sfc/sfc-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: sfc-rtd + project: sfc + project-name: sfc + + project-pattern: 'sfc' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-sfc/47392/' + rtd-token: 'bc4419f4dded5c816071b042ac32c03ac6108700' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/snaps/snaps-rtd-jobs.yaml b/jjb/snaps/snaps-rtd-jobs.yaml new file mode 100644 index 000000000..2159c1a8a --- /dev/null +++ b/jjb/snaps/snaps-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: snaps-rtd + project: snaps + project-name: snaps + + project-pattern: 'snaps' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-snaps/47393/' + rtd-token: '8fa2d732997534df1e91a87d6dc3ee60bb56508b' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/stor4nfv/stor4nfv-jobs.yaml b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml index 29af9ffbd..ff6814cb6 100644 --- a/jjb/stor4nfv/stor4nfv-jobs.yaml +++ b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml @@ -1,9 +1,10 @@ --- - project: - name: stor4nfv-docs - project: 'stor4nfv' - project-name: 'stor4nfv' + name: stor4nfv-rtd + project: stor4nfv + project-name: stor4nfv + gerrit-skip-vote: true project-pattern: 'stor4nfv' rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-stor4nfv/47394/' rtd-token: '9c189b44cf08de75dc06253558cc86ed93982cbb' diff --git a/jjb/storperf/storperf-daily-jobs.yaml b/jjb/storperf/storperf-daily-jobs.yaml index fe6aebb11..65e1d3232 100644 --- a/jjb/storperf/storperf-daily-jobs.yaml +++ b/jjb/storperf/storperf-daily-jobs.yaml @@ -15,8 +15,8 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - fraser: &fraser - stream: fraser + gambia: &gambia + stream: gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -69,7 +69,7 @@ - baremetal: slave-label: apex-baremetal-master installer: apex - <<: *fraser + <<: *gambia ## armband CI PODs # - armband-baremetal: # slave-label: armband-baremetal diff --git a/jjb/storperf/storperf-rtd-jobs.yaml b/jjb/storperf/storperf-rtd-jobs.yaml new file mode 100644 index 000000000..e8ee7b985 --- /dev/null +++ b/jjb/storperf/storperf-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: storperf-rtd + project: storperf + project-name: storperf + + project-pattern: 'storperf' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-storperf/47395/' + rtd-token: '8a5c04ef90e5f32edc4e805a5018763cd25e9afc' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/storperf/storperf-verify-jobs.yaml b/jjb/storperf/storperf-verify-jobs.yaml index 4d6b1740a..2acedd7d4 100644 --- a/jjb/storperf/storperf-verify-jobs.yaml +++ b/jjb/storperf/storperf-verify-jobs.yaml @@ -13,7 +13,7 @@ gs-pathname: '' disabled: false docker-tag: 'latest' - - fraser: &fraser + - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/storperf/storperf.yaml b/jjb/storperf/storperf.yaml index fe5784777..993094c87 100644 --- a/jjb/storperf/storperf.yaml +++ b/jjb/storperf/storperf.yaml @@ -13,7 +13,7 @@ gs-pathname: '' disabled: false docker-tag: 'latest' - - fraser: &fraser + - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/ves/ves-rtd-jobs.yaml b/jjb/ves/ves-rtd-jobs.yaml new file mode 100644 index 000000000..67b611baa --- /dev/null +++ b/jjb/ves/ves-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: ves-rtd + project: ves + project-name: ves + + gerrit-skip-vote: true + project-pattern: 'ves' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ves/47396/' + rtd-token: 'ea5026fc44841e7721529b95a9ebc1b29950e2ce' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/vnf_forwarding_graph/vnf-forwarding-graph-rtd-jobs.yaml b/jjb/vnf_forwarding_graph/vnf-forwarding-graph-rtd-jobs.yaml new file mode 100644 index 000000000..69895d101 --- /dev/null +++ b/jjb/vnf_forwarding_graph/vnf-forwarding-graph-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: vnf-forwarding-graph-rtd + project: vnf-forwarding-graph + project-name: vnf-forwarding-graph + + gerrit-skip-vote: true + project-pattern: 'vnf-forwarding-graph' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-vnf-forwarding-graph/47397/' + rtd-token: '5c6fd3d0f49fb88ea4230d6666d94b59fef86e7f' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml b/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml new file mode 100644 index 000000000..01b8cdf17 --- /dev/null +++ b/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: vswitchperf-rtd + project: vswitchperf + project-name: vswitchperf + + gerrit-skip-vote: true + project-pattern: 'vswitchperf' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-vswitchperf/47398/' + rtd-token: '47bbe5675e6cc5a6207fcc9b4db8dac03c27d9de' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/xci/xci-rtd-jobs.yaml b/jjb/xci/xci-rtd-jobs.yaml new file mode 100644 index 000000000..d21aad5a0 --- /dev/null +++ b/jjb/xci/xci-rtd-jobs.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: releng-xci-rtd + project: releng-xci + project-name: releng-xci + + gerrit-skip-vote: true + project-pattern: 'releng-xci' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-releng-xci/47389/' + rtd-token: '7dbc774ea9a625296d2e973aff3e79af26b15d4d' + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml index e42dbedc1..1c622acf2 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yaml +++ b/jjb/yardstick/yardstick-daily-jobs.yaml @@ -58,6 +58,16 @@ auto-trigger-name: 'daily-trigger-disabled' <<: *master - virtual: + slave-label: apex-virtual-master + installer: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia + - baremetal: + slave-label: apex-baremetal-master + installer: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia + - virtual: slave-label: apex-virtual-fraser installer: apex auto-trigger-name: 'daily-trigger-disabled' @@ -82,12 +92,12 @@ slave-label: fuel-baremetal installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *gambia - virtual: slave-label: fuel-virtual installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *gambia # armband CI PODs - armband-baremetal: slave-label: armband-baremetal @@ -103,12 +113,12 @@ slave-label: armband-baremetal installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *gambia - armband-virtual: slave-label: armband-virtual installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *gambia # joid CI PODs - baremetal: slave-label: joid-baremetal @@ -151,6 +161,16 @@ installer: compass auto-trigger-name: 'daily-trigger-disabled' <<: *fraser + - baremetal: + slave-label: compass-baremetal + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia + - virtual: + slave-label: compass-virtual + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia # daisy CI PODs - baremetal: slave-label: daisy-baremetal @@ -184,7 +204,7 @@ slave-label: '{pod}' installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *gambia - zte-pod2: slave-label: '{pod}' installer: daisy diff --git a/jjb/yardstick/yardstick-rtd-jobs.yaml b/jjb/yardstick/yardstick-rtd-jobs.yaml new file mode 100644 index 000000000..88574f0a5 --- /dev/null +++ b/jjb/yardstick/yardstick-rtd-jobs.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: yardstick-rtd + project: yardstick + project-name: yardstick + + project-pattern: 'yardstick' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-yardstick/47399/' + rtd-token: '6aa883824f3917c7db5ffa1fe9168817fb5feb68' + + jobs: + - '{project-name}-rtd-jobs' |