X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yaml;h=23a1daf0f16d3a09824cd8a6c8d024e91acd740e;hb=afa13d6ee8b87c8e63e71fa2ceead357396b8f70;hp=fd0e8269cfdb2b025bf084659474030213ef9213;hpb=c20919f1f430cfbad1238a6d74b9c782f696732d;p=releng.git diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index fd0e8269c..23a1daf0f 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -8,7 +8,7 @@ - 'apex-virtual-{stream}' - 'apex-deploy-{platform}-{stream}' - 'apex-daily-{stream}' - - 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' + - 'apex-{snap_type}-promote-daily-{stream}-os-{os_version}-{topology}' - 'apex-fdio-promote-daily-{stream}' - 'apex-{scenario}-baremetal-{scenario_stream}' - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' @@ -30,6 +30,16 @@ scenario_stream: 'master' disable_daily: false disable_promote: false + - gambia: &gambia + branch: 'stable/gambia' + gs-pathname: '/gambia' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-nosdn-nofeature-ha' + scenario_stream: 'gambia' + disable_daily: false + disable_promote: false - fraser: &fraser branch: 'stable/fraser' gs-pathname: '/fraser' @@ -67,6 +77,30 @@ <<: *fraser - 'os-odl-bgpvpn-ha': <<: *fraser + - 'os-nosdn-nofeature-noha': + <<: *gambia + - 'os-nosdn-nofeature-ha': + <<: *gambia + - 'os-nosdn-nofeature-ha-ipv6': + <<: *gambia + - 'os-odl-nofeature-noha': + <<: *gambia + - 'os-odl-nofeature-ha': + <<: *gambia + - 'k8s-nosdn-nofeature-noha': + <<: *gambia + - 'os-odl-bgpvpn-ha': + <<: *gambia + - 'os-odl-bgpvpn-noha': + <<: *gambia + - 'os-odl-sfc-ha': + <<: *gambia + - 'os-odl-sfc-noha': + <<: *gambia + - 'os-nosdn-calipso-noha': + <<: *gambia + - 'os-ovn-nofeature-ha': + <<: *gambia - 'os-nosdn-nofeature-noha': <<: *danube - 'os-nosdn-nofeature-ha': @@ -129,15 +163,15 @@ <<: *master - 'os-odl-nofeature-ha': <<: *master - - 'os-nosdn-queens-noha': + - 'os-nosdn-rocky-noha': <<: *master - - 'os-nosdn-queens-ha': + - 'os-nosdn-rocky-ha': <<: *master - - 'os-nosdn-queens-ha-ipv6': + - 'os-nosdn-rocky-ha-ipv6': <<: *master - - 'os-odl-queens-noha': + - 'os-odl-rocky-noha': <<: *master - - 'os-odl-queens-ha': + - 'os-odl-rocky-ha': <<: *master - 'k8s-nosdn-nofeature-noha': <<: *master @@ -153,13 +187,17 @@ <<: *master - 'os-odl-sfc-noha': <<: *master - - 'os-odl-sfc_queens-ha': + - 'os-odl-sfc_rocky-ha': <<: *master - - 'os-odl-sfc_queens-noha': + - 'os-odl-sfc_rocky-noha': <<: *master - 'os-nosdn-calipso-noha': <<: *master - - 'os-nosdn-calipso_queens-noha': + - 'os-nosdn-calipso_rocky-noha': + <<: *master + - 'os-ovn-nofeature-ha': + <<: *master + - 'os-ovn-rocky-ha': <<: *master - 'os-nosdn-nofeature-noha': <<: *euphrates @@ -201,21 +239,26 @@ - 'virtual' os_version: - - 'pike': - os_scenario: 'pike' - odl_branch: 'stable/carbon' - 'queens': - os_scenario: 'queens' + os_scenario: 'nofeature' + odl_branch: 'stable/oxygen' + - 'rocky': + os_scenario: 'rocky' odl_branch: 'stable/oxygen' - 'master': os_scenario: 'nofeature' - odl_branch: 'stable/oxygen' + odl_branch: 'stable/fluorine' topology: - 'noha' - 'ha' - 'noha-allinone' + snap_type: + - csit: + sdn: 'odl' + - functest: + sdn: 'nosdn' # Fetch Logs Job - job-template: name: 'apex-fetch-logs-{stream}' @@ -269,7 +312,7 @@ - logrotate-default - build-blocker: use-build-blocker: false - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-deploy.*' - throttle: @@ -346,7 +389,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-deploy.*' - 'functest.*' @@ -402,13 +445,14 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-runner.*' - 'apex-run.*' - 'apex-virtual-.*' - 'apex-verify-gate-.*' - 'odl-netvirt.*' + - 'apex-.*-promote.*' - throttle: max-per-node: 1 max-total: 10 @@ -436,14 +480,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 @@ -454,7 +490,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 @@ -506,7 +541,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -546,23 +581,10 @@ kill-phase-on: NEVER 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') - else - functest_scenario=$DEPLOY_SCENARIO - fi - echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties + - shell: + !include-raw-escape: ./apex-functest-scenario.sh - inject: - properties-file: functest_properties + properties-file: functest_scenario override-build-parameters: true - multijob: name: 'OPNFV Test Suite' @@ -571,8 +593,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 @@ -613,12 +636,16 @@ 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 - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -639,8 +666,9 @@ - name: 'functest-apex-baremetal-daily-{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: false git-revision: false @@ -733,7 +761,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-daily.*' @@ -816,7 +844,7 @@ # CSIT promote - job-template: - name: 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' + name: 'apex-{snap_type}-promote-daily-{stream}-os-{os_version}-{topology}' # Job template for promoting CSIT Snapshots # @@ -846,7 +874,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 @@ -856,16 +884,23 @@ 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" + - string: + name: SNAP_TYPE + default: '{snap_type}' + description: Type of snapshot to promote properties: - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' - 'apex-daily.*' - - 'apex-csit-promote.*' + - 'apex-.*-promote.*' - 'odl-netvirt.*' - throttle: max-per-node: 1 @@ -873,7 +908,7 @@ option: 'project' triggers: - - timed: '0 12 * * 0' + - '{stream}-{snap_type}-{os_version}' builders: - multijob: @@ -883,7 +918,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: true predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_scenario}-{topology} + DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}-{snap_type} OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -904,28 +939,49 @@ abort-all-job: true git-revision: false - multijob: - name: csit + name: test phase condition: SUCCESSFUL execution-type: SEQUENTIALLY projects: - name: cperf-apex-csit-master predefined-parameters: | ODL_BRANCH=$ODL_BRANCH - RC_FILE_PATH=/tmp/csit/overcloudrc - NODE_FILE_PATH=/tmp/csit/node.yaml - SSH_KEY_PATH=/tmp/csit/id_rsa + RC_FILE_PATH=/tmp/snap/overcloudrc + NODE_FILE_PATH=/tmp/snap/node.yaml + SSH_KEY_PATH=/tmp/snap/id_rsa ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION + SKIP_CSIT=$FORCE_PROMOTE + SNAP_TYPE=$SNAP_TYPE node-parameters: true kill-phase-on: NEVER abort-all-job: false + enable-condition: "def m = '$SNAP_TYPE' ==~ /csit/" - name: cperf-upload-logs-csit predefined-parameters: | ODL_BRANCH=$ODL_BRANCH OS_VERSION=$OS_VERSION + SNAP_TYPE=$SNAP_TYPE node-parameters: true kill-phase-on: FAILURE abort-all-job: false + enable-condition: "def m = '$SNAP_TYPE' ==~ /csit/" + - name: 'functest-apex-virtual-suite-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG + FUNCTEST_SUITE_NAME=tempest_smoke + FUNCTEST_MODE=testcase + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: NEVER + enable-condition: "def m = '$SNAP_TYPE' ==~ /functest/" + abort-all-job: true + git-revision: false - name: 'apex-fetch-logs-{stream}' current-parameters: false predefined-parameters: | @@ -943,8 +999,6 @@ projects: - name: 'apex-create-snapshot' current-parameters: true - predefined-parameters: | - SNAP_TYPE=csit node-parameters: true kill-phase-on: FAILURE abort-all-job: true @@ -955,8 +1009,6 @@ projects: - name: 'apex-upload-snapshot' current-parameters: true - predefined-parameters: | - SNAP_TYPE=csit node-parameters: true kill-phase-on: FAILURE abort-all-job: true @@ -988,7 +1040,7 @@ properties: - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-deploy.*' @@ -1060,7 +1112,7 @@ project-type: 'multijob' - disabled: false + disabled: true node: 'flex-pod2' @@ -1094,7 +1146,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -1163,7 +1215,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -1274,6 +1326,111 @@ abort-all-job: true git-revision: false +# gambia Builder +- builder: + name: apex-builder-gambia + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: + - name: 'apex-os-nosdn-nofeature-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-nofeature-ha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-nofeature-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-nofeature-ha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-bgpvpn-ha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-bgpvpn-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-sfc-ha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-sfc-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-calipso-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-ovn-nofeature-ha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + # danube Builder - builder: name: apex-builder-danube @@ -1539,7 +1696,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-queens-noha-baremetal-master' + - name: 'apex-os-nosdn-rocky-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1547,7 +1704,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-queens-ha-baremetal-master' + - name: 'apex-os-nosdn-rocky-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1555,7 +1712,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-queens-ha-ipv6-baremetal-master' + - name: 'apex-os-nosdn-rocky-ha-ipv6-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1563,7 +1720,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-queens-noha-baremetal-master' + - name: 'apex-os-odl-rocky-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1571,7 +1728,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-queens-ha-baremetal-master' + - name: 'apex-os-odl-rocky-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1635,7 +1792,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc_queens-ha-baremetal-master' + - name: 'apex-os-odl-sfc_rocky-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1643,7 +1800,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc_queens-noha-baremetal-master' + - name: 'apex-os-odl-sfc_rocky-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1659,7 +1816,23 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-calipso_queens-noha-baremetal-master' + - name: 'apex-os-nosdn-calipso_rocky-noha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-ovn-nofeature-ha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-ovn-rocky-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1838,12 +2011,18 @@ ####################### # trigger macros +# timed is in format: 'min hour daymonth month dayweek' ######################## - trigger: name: 'apex-master' triggers: - timed: '0 0 1-31/2 * *' +- trigger: + name: 'apex-gambia' + triggers: + - timed: '0 4 2-30/2 * *' + - trigger: name: 'apex-fraser' triggers: @@ -1858,3 +2037,152 @@ name: 'apex-danube' triggers: - timed: '0 3 1 1 7' + +- trigger: + name: 'master-csit-master' + triggers: + - timed: '0 5 * * *' + +- trigger: + name: 'master-csit-rocky' + triggers: + - timed: '0 5 * * *' + +- trigger: + name: 'master-csit-queens' + triggers: + - timed: '' + +- trigger: + name: 'gambia-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'gambia-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'gambia-csit-queens' + triggers: + - timed: '0 5 * * *' + +- trigger: + name: 'fraser-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'fraser-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'fraser-csit-queens' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-csit-queens' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-rocky' + triggers: + - timed: '' + +- trigger: + name: 'danube-csit-queens' + triggers: + - timed: '' +- trigger: + name: 'master-functest-master' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'master-functest-rocky' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'master-functest-queens' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-master' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-rocky' + triggers: + - timed: '' + +- trigger: + name: 'gambia-functest-queens' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'fraser-functest-master' + triggers: + - timed: '' + +- trigger: + name: 'fraser-functest-rocky' + triggers: + - timed: '' + +- trigger: + name: 'fraser-functest-queens' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-functest-master' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-functest-rocky' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-functest-queens' + triggers: + - timed: '' + +- trigger: + name: 'danube-functest-master' + triggers: + - timed: '' + +- trigger: + name: 'danube-functest-rocky' + triggers: + - timed: '' + +- trigger: + name: 'danube-functest-queens' + triggers: + - timed: ''