diff options
Diffstat (limited to 'jjb/apex')
| -rw-r--r-- | jjb/apex/apex-rtd-jobs.yaml | 12 | ||||
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 14 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 51 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 51 |
4 files changed, 71 insertions, 57 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' |