X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml;h=587a06377a02f3ea1d41b7f7e75376e1a7474a36;hb=d29c3e495aee81b96f653b6a4b5ee72a9bf33976;hp=cf29b928c43e20f4803499bdce929a136b17a261;hpb=91fdca46210a711efd88fc8ebbf0fd1f65ea90c5;p=releng.git diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index cf29b928c..587a06377 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -3,6 +3,7 @@ name: 'apex' project: 'apex' jobs: + - 'apex-fetch-logs-{stream}' - 'apex-runner-cperf-{stream}' - 'apex-virtual-{stream}' - 'apex-deploy-{platform}-{stream}' @@ -27,6 +28,17 @@ verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'master' disable_daily: false + disable_promote: false + - fraser: &fraser + branch: 'stable/fraser' + gs-pathname: '/fraser' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-odl-nofeature-ha' + scenario_stream: 'fraser' + disable_daily: false + disable_promote: true - euphrates: &euphrates branch: 'stable/euphrates' gs-pathname: '/euphrates' @@ -36,6 +48,7 @@ verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'euphrates' disable_daily: true + disable_promote: true - danube: &danube branch: 'stable/danube' gs-pathname: '/danube' @@ -46,8 +59,39 @@ scenario_stream: 'danube' disabled: true disable_daily: true + disable_promote: true scenario: + - 'os-nosdn-nofeature-noha': + <<: *fraser + - 'os-nosdn-nofeature-ha': + <<: *fraser + - 'os-odl-nofeature-ha': + <<: *fraser + - 'os-odl-nofeature-noha': + <<: *fraser + - 'os-odl-bgpvpn-ha': + <<: *fraser + - 'os-ovn-nofeature-noha': + <<: *fraser + - 'os-nosdn-fdio-noha': + <<: *fraser + - 'os-nosdn-fdio-ha': + <<: *fraser + - 'os-nosdn-bar-ha': + <<: *fraser + - 'os-nosdn-bar-noha': + <<: *fraser + - 'os-nosdn-ovs_dpdk-noha': + <<: *fraser + - 'os-nosdn-ovs_dpdk-ha': + <<: *fraser + - 'os-odl-sfc-noha': + <<: *fraser + - 'os-odl-sfc-ha': + <<: *fraser + - 'os-nosdn-calipso-noha': + <<: *fraser - 'os-nosdn-nofeature-noha': <<: *danube - 'os-nosdn-nofeature-ha': @@ -100,45 +144,9 @@ <<: *danube - 'os-ovn-nofeature-noha': <<: *danube - - 'os-nosdn-nofeature-noha': - <<: *master - - 'os-nosdn-nofeature-ha': - <<: *master - - 'os-odl-nofeature-ha': - <<: *master - - 'os-odl-nofeature-noha': - <<: *master - - 'os-odl-bgpvpn-ha': - <<: *master - - 'os-odl-bgpvpn-noha': + - 'os-odl-master_upstream-noha': <<: *master - - 'os-odl-sriov-noha': - <<: *master - - 'os-odl-ovs_offload-noha': - <<: *master - - 'os-ovn-nofeature-noha': - <<: *master - - 'os-nosdn-fdio-noha': - <<: *master - - 'os-nosdn-fdio-ha': - <<: *master - - 'os-nosdn-bar-ha': - <<: *master - - 'os-nosdn-bar-noha': - <<: *master - - 'os-nosdn-ovs_dpdk-noha': - <<: *master - - 'os-nosdn-ovs_dpdk-ha': - <<: *master - - 'os-odl-ovs_dpdk-noha': - <<: *master - - 'os-odl-ovs_dpdk-ha': - <<: *master - - 'os-odl-sfc-noha': - <<: *master - - 'os-odl-sfc-ha': - <<: *master - - 'os-nosdn-calipso-noha': + - 'os-odl-queens_upstream-noha': <<: *master - 'os-nosdn-nofeature-noha': <<: *euphrates @@ -181,6 +189,38 @@ - 'baremetal' - 'virtual' + os_version: + - 'pike' + - 'queens' + - 'master' + + +# Fetch Logs Job +- job-template: + name: 'apex-fetch-logs-{stream}' + + concurrent: true + + disabled: false + scm: + - git-scm-gerrit + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - apex-parameter: + gs-pathname: '{gs-pathname}' + # yamllint enable rule:line-length + properties: + - logrotate-default + - throttle: + max-per-node: 1 + max-total: 10 + option: 'project' + + builders: + - 'apex-fetch-logs' + - job-template: name: 'apex-runner-cperf-{stream}' @@ -374,7 +414,7 @@ git-revision: true - multijob: name: functest-smoke - condition: SUCCESSFUL + condition: ALWAYS projects: - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false @@ -389,6 +429,20 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false + - multijob: + name: apex-fetch-logs + projects: + - name: 'apex-fetch-logs-{stream}' + current-parameters: false + predefined-parameters: | + 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 + abort-all-job: true + git-revision: false # Baremetal Deploy and Test - job-template: @@ -436,6 +490,7 @@ - multijob: name: 'Baremetal Deploy' condition: SUCCESSFUL + execution-type: SEQUENTIALLY projects: - name: 'apex-deploy-baremetal-{scenario_stream}' node-parameters: true @@ -445,11 +500,21 @@ GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC= DEPLOY_SCENARIO=$DEPLOY_SCENARIO - kill-phase-on: FAILURE + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-fetch-logs-{scenario_stream}' + current-parameters: true + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= + node-parameters: true + kill-phase-on: NEVER abort-all-job: true git-revision: false - multijob: name: 'OPNFV Test Suite' + condition: ALWAYS projects: - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true @@ -459,7 +524,18 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - + - multijob: + name: apex-fetch-logs + projects: + - name: 'apex-fetch-logs-{scenario_stream}' + current-parameters: true + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false publishers: - groovy-postbuild: script: @@ -530,7 +606,7 @@ abort-all-job: false git-revision: false - multijob: - name: Dovetail + name: Dovetail-proposed_tests condition: ALWAYS projects: - name: 'dovetail-apex-baremetal-proposed_tests-{scenario_stream}' @@ -539,7 +615,22 @@ predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: NEVER - enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/ + && $BUILD_NUMBER % 2 == 1" + abort-all-job: false + git-revision: false + - multijob: + name: Dovetail-default + condition: ALWAYS + projects: + - name: 'dovetail-apex-baremetal-default-{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/ + && $BUILD_NUMBER % 2 == 0" abort-all-job: false git-revision: false - multijob: @@ -676,7 +767,7 @@ # branch: branch (eg. stable) node: '{virtual-slave}' project-type: 'multijob' - disabled: false + disabled: '{disable_promote}' scm: - git-scm @@ -702,21 +793,6 @@ - timed: '0 12 * * 0' builders: - - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'apex-build-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - git-revision: true - multijob: name: deploy-virtual condition: SUCCESSFUL @@ -724,7 +800,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l3-csit-noha + DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -742,7 +818,7 @@ - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l3-nofeature-noha + DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha FUNCTEST_SUITE_NAME=tempest_smoke_serial GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -1064,15 +1140,15 @@ # builder macros ######################## -# danube Builder +# fraser Builder - builder: - name: apex-builder-danube + name: apex-builder-fraser builders: - multijob: name: Baremetal Deploy and Test Phase condition: SUCCESSFUL projects: - - name: 'apex-os-nosdn-nofeature-noha-baremetal-danube' + - name: 'apex-os-nosdn-nofeature-noha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1080,7 +1156,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-nofeature-ha-baremetal-danube' + - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1088,7 +1164,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-danube' + - name: 'apex-os-odl-nofeature-ha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1096,7 +1172,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-ovs-noha-baremetal-danube' + - name: 'apex-os-odl-nofeature-noha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1104,7 +1180,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-ovs-ha-baremetal-danube' + - name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1112,7 +1188,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-fdio-noha-baremetal-danube' + - name: 'apex-os-ovn-nofeature-noha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1120,7 +1196,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-fdio-ha-baremetal-danube' + - name: 'apex-os-nosdn-fdio-noha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1128,7 +1204,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-kvm-ha-baremetal-danube' + - name: 'apex-os-nosdn-fdio-ha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1136,7 +1212,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-kvm-noha-baremetal-danube' + - name: 'apex-os-nosdn-bar-ha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1144,7 +1220,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_l2-fdio-noha-baremetal-danube' + - name: 'apex-os-nosdn-bar-noha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1152,7 +1228,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_l2-fdio-ha-baremetal-danube' + - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1160,7 +1236,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_netvirt-fdio-noha-baremetal-danube' + - name: 'apex-os-nosdn-ovs_dpdk-ha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1168,7 +1244,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_l2-sfc-noha-baremetal-danube' + - name: 'apex-os-odl-sfc-noha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1176,7 +1252,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_l3-nofeature-noha-baremetal-danube' + - name: 'apex-os-odl-sfc-ha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1184,7 +1260,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_l3-nofeature-ha-baremetal-danube' + - name: 'apex-os-nosdn-calipso-noha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1192,31 +1268,16 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_l3-ovs-noha-baremetal-danube' - 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_l3-ovs-ha-baremetal-danube' - 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-danube' - 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-gluon-noha-baremetal-danube' + +# danube Builder +- builder: + name: apex-builder-danube + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: + - name: 'apex-os-nosdn-nofeature-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1224,7 +1285,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_l3-fdio-noha-baremetal-danube' + - name: 'apex-os-nosdn-nofeature-ha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1232,7 +1293,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_l3-fdio-ha-baremetal-danube' + - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1240,7 +1301,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_l3-fdio_dvr-noha-baremetal-danube' + - name: 'apex-os-nosdn-ovs-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1248,7 +1309,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_l3-fdio_dvr-ha-baremetal-danube' + - name: 'apex-os-nosdn-ovs-ha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1256,7 +1317,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl_l3-csit-noha-baremetal-danube' + - name: 'apex-os-nosdn-fdio-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1264,7 +1325,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-onos-nofeature-ha-baremetal-danube' + - name: 'apex-os-nosdn-fdio-ha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1272,7 +1333,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-ovn-nofeature-noha-baremetal-danube' + - name: 'apex-os-nosdn-kvm-ha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1280,16 +1341,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - -# master Builder -- builder: - name: apex-builder-master - builders: - - multijob: - name: Baremetal Deploy and Test Phase - condition: SUCCESSFUL - projects: - - name: 'apex-os-nosdn-nofeature-noha-baremetal-master' + - name: 'apex-os-nosdn-kvm-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1297,7 +1349,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-nofeature-ha-baremetal-master' + - name: 'apex-os-odl_l2-fdio-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1305,7 +1357,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-nofeature-ha-baremetal-master' + - name: 'apex-os-odl_l2-fdio-ha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1313,7 +1365,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-nofeature-noha-baremetal-master' + - name: 'apex-os-odl_netvirt-fdio-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1321,7 +1373,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-bgpvpn-ha-baremetal-master' + - name: 'apex-os-odl_l2-sfc-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1329,7 +1381,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-bgpvpn-noha-baremetal-master' + - name: 'apex-os-odl_l3-nofeature-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1337,7 +1389,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sriov-noha-baremetal-master' + - name: 'apex-os-odl_l3-nofeature-ha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1345,7 +1397,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-ovs_offload-noha-baremetal-master' + - name: 'apex-os-odl_l3-ovs-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1353,7 +1405,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-ovn-nofeature-noha-baremetal-master' + - name: 'apex-os-odl_l3-ovs-ha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1361,7 +1413,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-fdio-noha-baremetal-master' + - name: 'apex-os-odl-bgpvpn-ha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1369,7 +1421,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-fdio-ha-baremetal-master' + - name: 'apex-os-odl-gluon-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1377,7 +1429,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-bar-ha-baremetal-master' + - name: 'apex-os-odl_l3-fdio-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1385,7 +1437,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-bar-noha-baremetal-master' + - name: 'apex-os-odl_l3-fdio-ha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1393,7 +1445,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-master' + - name: 'apex-os-odl_l3-fdio_dvr-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1401,7 +1453,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-ovs_dpdk-ha-baremetal-master' + - name: 'apex-os-odl_l3-fdio_dvr-ha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1409,7 +1461,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-ovs_dpdk-noha-baremetal-master' + - name: 'apex-os-odl_l3-csit-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1417,7 +1469,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-ovs_dpdk-ha-baremetal-master' + - name: 'apex-os-onos-nofeature-ha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1425,7 +1477,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc-noha-baremetal-master' + - name: 'apex-os-ovn-nofeature-noha-baremetal-danube' node-parameters: false current-parameters: false predefined-parameters: | @@ -1433,7 +1485,16 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc-ha-baremetal-master' + +# master Builder +- builder: + name: apex-builder-master + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: + - name: 'apex-os-odl-master_upstream-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1441,7 +1502,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-calipso-noha-baremetal-master' + - name: 'apex-os-odl-queens_upstream-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1620,6 +1681,12 @@ - shell: !include-raw: ./apex-deploy.sh +- builder: + name: 'apex-fetch-logs' + builders: + - shell: + !include-raw: ./apex-fetch-logs.sh + ####################### # trigger macros ######################## @@ -1628,6 +1695,11 @@ triggers: - timed: '0 0 1-31/2 * *' +- trigger: + name: 'apex-fraser' + triggers: + - timed: '0 0 2-30/2 * *' + - trigger: name: 'apex-euphrates' triggers: