X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yaml;h=fb2eaa2db06939189fe53cc8df256502fd522dc4;hb=84cf308c1df4a10091fa1a14982543f122bc8679;hp=80a4d82f527e451928e32040baf87850435b3715;hpb=0cc376f661bf39f1b2e259e8b32f88ac51f6e944;p=releng.git diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 80a4d82f5..fb2eaa2db 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -16,7 +16,6 @@ - 'apex-create-snapshot' - 'apex-fetch-snap-info' - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}' - - 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) stream: @@ -28,8 +27,18 @@ baremetal-slave: 'apex-baremetal-master' verify-scenario: 'os-nosdn-nofeature-noha' scenario_stream: 'master' - disable_daily: false - disable_promote: false + disable_daily: true + disable_promote: true + - hunter: &hunter + branch: 'stable/hunter' + gs-pathname: '/hunter' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-nosdn-nofeature-ha' + scenario_stream: 'hunter' + disable_daily: true + disable_promote: true - gambia: &gambia branch: 'stable/gambia' gs-pathname: '/gambia' @@ -38,8 +47,8 @@ baremetal-slave: 'apex-baremetal-master' verify-scenario: 'os-nosdn-nofeature-ha' scenario_stream: 'gambia' - disable_daily: false - disable_promote: false + disable_daily: true + disable_promote: true - fraser: &fraser branch: 'stable/fraser' gs-pathname: '/fraser' @@ -48,7 +57,7 @@ baremetal-slave: 'apex-baremetal-master' verify-scenario: 'os-nosdn-nofeature-ha' scenario_stream: 'fraser' - disable_daily: false + disable_daily: true disable_promote: true - euphrates: &euphrates branch: 'stable/euphrates' @@ -73,34 +82,6 @@ disable_promote: true scenario: - - 'os-nosdn-nofeature-ha': - <<: *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': @@ -157,48 +138,40 @@ <<: *master - 'os-nosdn-nofeature-ha': <<: *master + - 'os-nosdn-nofeature-noha': + <<: *gambia + - 'os-nosdn-nofeature-ha': + <<: *gambia - 'os-nosdn-nofeature-ha-ipv6': - <<: *master + <<: *gambia - 'os-odl-nofeature-noha': - <<: *master + <<: *gambia - 'os-odl-nofeature-ha': - <<: *master - - 'os-nosdn-rocky-noha': - <<: *master - - 'os-nosdn-rocky-ha': - <<: *master - - 'os-nosdn-rocky-ha-ipv6': - <<: *master - - 'os-odl-rocky-noha': - <<: *master - - 'os-odl-rocky-ha': - <<: *master + <<: *gambia - 'k8s-nosdn-nofeature-noha': - <<: *master + <<: *gambia - 'os-odl-bgpvpn-ha': - <<: *master + <<: *gambia - 'os-odl-bgpvpn-noha': - <<: *master - - 'os-odl-bgpvpn_queens-ha': - <<: *master - - 'os-odl-bgpvpn_queens-noha': - <<: *master + <<: *gambia - 'os-odl-sfc-ha': - <<: *master + <<: *gambia - 'os-odl-sfc-noha': - <<: *master - - 'os-odl-sfc_rocky-ha': - <<: *master - - 'os-odl-sfc_rocky-noha': - <<: *master + <<: *gambia - 'os-nosdn-calipso-noha': - <<: *master - - 'os-nosdn-calipso_rocky-noha': - <<: *master + <<: *gambia - 'os-ovn-nofeature-ha': - <<: *master - - 'os-ovn-rocky-ha': - <<: *master + <<: *gambia + - 'os-nosdn-nofeature-ha': + <<: *fraser + - 'os-odl-bgpvpn-ha': + <<: *fraser + - 'os-nosdn-nofeature-noha': + <<: *hunter + - 'os-nosdn-nofeature-ha': + <<: *hunter + - 'os-ovn-nofeature-ha': + <<: *hunter - 'os-nosdn-nofeature-noha': <<: *euphrates - 'os-nosdn-nofeature-ha': @@ -685,7 +658,7 @@ abort-all-job: false git-revision: false - multijob: - name: Dovetail-proposed_tests + name: Dovetail-default-mandatory condition: ALWAYS projects: - name: 'dovetail-apex-baremetal-default-mandatory-{scenario_stream}' @@ -698,7 +671,7 @@ abort-all-job: false git-revision: false - multijob: - name: Dovetail-default + name: Dovetail-default-optional condition: ALWAYS projects: - name: 'dovetail-apex-baremetal-default-optional-{scenario_stream}' @@ -710,6 +683,19 @@ enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" abort-all-job: false git-revision: false + - multijob: + name: Dovetail-proposed_tests + condition: ALWAYS + projects: + - name: 'dovetail-apex-baremetal-proposed_tests-optional-{scenario_stream}' + node-parameters: true + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + kill-phase-on: NEVER + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" + abort-all-job: false + git-revision: false - multijob: name: StorPerf condition: ALWAYS @@ -918,7 +904,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: true predefined-parameters: | - DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology} + DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}-{snap_type} OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -946,9 +932,9 @@ - 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 @@ -1189,72 +1175,6 @@ abort-all-job: false git-revision: false -# Dovetail Danube test job -- job-template: - name: 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube' - - project-type: 'multijob' - - node: 'huawei-pod4' - - disabled: false - - parameters: - - '{project}-defaults' - - project-parameter: - project: '{project}' - branch: 'stable/danube' - - apex-parameter: - gs-pathname: '/danube' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - description: "Scenario to deploy with." - - properties: - - logrotate-default - - build-blocker: - use-build-blocker: true - blocking-level: 'NODE' - blocking-jobs: - - 'apex-verify.*' - - 'apex-runner.*' - - 'apex-.*-promote.*' - - 'apex-run.*' - - triggers: - - timed: '' # '0 1 * * *' - - builders: - - description-setter: - description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" - - multijob: - name: 'Baremetal Deploy' - condition: SUCCESSFUL - projects: - - name: 'apex-deploy-baremetal-danube' - node-parameters: true - current-parameters: true - predefined-parameters: | - OPNFV_CLEAN=yes - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC= - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - kill-phase-on: FAILURE - abort-all-job: true - git-revision: false - - multijob: - name: Dovetail - condition: ALWAYS - projects: - - name: 'dovetail-apex-baremetal-proposed_tests-danube' - node-parameters: true - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - kill-phase-on: NEVER - abort-all-job: false - git-revision: false ######################## # parameter macros @@ -1301,136 +1221,6 @@ # builder macros ######################## -# fraser Builder -- builder: - name: apex-builder-fraser - builders: - - multijob: - name: Baremetal Deploy and Test Phase - condition: SUCCESSFUL - projects: - - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser' - 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-fraser' - node-parameters: false - current-parameters: false - predefined-parameters: | - OPNFV_CLEAN=yes - kill-phase-on: NEVER - 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 @@ -1672,39 +1462,16 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-nofeature-ha-ipv6-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-odl-nofeature-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-odl-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-nosdn-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-nosdn-rocky-ha-baremetal-master' + +# 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: | @@ -1712,7 +1479,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-rocky-ha-ipv6-baremetal-master' + - name: 'apex-os-nosdn-nofeature-ha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1720,7 +1487,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-rocky-noha-baremetal-master' + - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1728,7 +1495,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-rocky-ha-baremetal-master' + - name: 'apex-os-odl-nofeature-noha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1736,7 +1503,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-master' + - name: 'apex-os-odl-nofeature-ha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1744,7 +1511,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-bgpvpn-ha-baremetal-master' + - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1752,7 +1519,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-bgpvpn-noha-baremetal-master' + - name: 'apex-os-odl-bgpvpn-ha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1760,7 +1527,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-bgpvpn_queens-ha-baremetal-master' + - name: 'apex-os-odl-bgpvpn-noha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1768,7 +1535,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-bgpvpn_queens-noha-baremetal-master' + - name: 'apex-os-odl-sfc-ha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1776,7 +1543,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc-ha-baremetal-master' + - name: 'apex-os-odl-sfc-noha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1784,7 +1551,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc-noha-baremetal-master' + - name: 'apex-os-nosdn-calipso-noha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1792,7 +1559,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc_rocky-ha-baremetal-master' + - name: 'apex-os-ovn-nofeature-ha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1800,7 +1567,16 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc_rocky-noha-baremetal-master' + +# fraser Builder +- builder: + name: apex-builder-fraser + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: + - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1808,7 +1584,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-calipso-noha-baremetal-master' + - name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1816,7 +1592,16 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-calipso_rocky-noha-baremetal-master' + +# hunter Builder +- builder: + name: apex-builder-hunter + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: + - name: 'apex-os-nosdn-nofeature-noha-baremetal-hunter' node-parameters: false current-parameters: false predefined-parameters: | @@ -1824,7 +1609,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-ovn-nofeature-ha-baremetal-master' + - name: 'apex-os-nosdn-nofeature-ha-baremetal-hunter' node-parameters: false current-parameters: false predefined-parameters: | @@ -1832,7 +1617,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-ovn-rocky-ha-baremetal-master' + - name: 'apex-os-ovn-nofeature-ha-baremetal-hunter' node-parameters: false current-parameters: false predefined-parameters: | @@ -2018,6 +1803,11 @@ triggers: - timed: '0 0 1-31/2 * *' +- trigger: + name: 'apex-hunter' + triggers: + - timed: '0 4 2-30/2 * *' + - trigger: name: 'apex-gambia' triggers: @@ -2053,6 +1843,21 @@ triggers: - timed: '' +- trigger: + name: 'hunter-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'hunter-csit-rocky' + triggers: + - timed: '0 5 * * *' + +- trigger: + name: 'hunter-csit-queens' + triggers: + - timed: '' + - trigger: name: 'gambia-csit-master' triggers: @@ -2127,6 +1932,21 @@ triggers: - timed: '' +- trigger: + name: 'hunter-functest-master' + triggers: + - timed: '' + +- trigger: + name: 'hunter-functest-rocky' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'hunter-functest-queens' + triggers: + - timed: '' + - trigger: name: 'gambia-functest-master' triggers: