From 1aab0249f0e91b645385e8af9d0591eac5d49e3f Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Mon, 25 Sep 2017 14:51:24 -0500 Subject: [PATCH] run for E release. As JOID do not have access to any other POD so changing from master to E release for E release build. Change-Id: I1ba9b92be0c3056023eac0e5869de041cf429344 Signed-off-by: Narinder Gupta --- jjb/joid/joid-daily-jobs.yml | 218 +++++++------------------------------------ 1 file changed, 34 insertions(+), 184 deletions(-) diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml index ac04962e0..b28efc3b3 100644 --- a/jjb/joid/joid-daily-jobs.yml +++ b/jjb/joid/joid-daily-jobs.yml @@ -13,11 +13,11 @@ # ------------------------------- # BRANCH ANCHORS # ------------------------------- - master: &master - stream: master - branch: '{stream}' - disabled: false - gs-pathname: '' + euphrates: &euphrates + stream: euphrates + branch: 'stable/{stream}' + disabled: false + gs-pathname: '/{stream}' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- @@ -26,19 +26,8 @@ pod: - baremetal: slave-label: joid-baremetal - <<: *master - - virtual: - slave-label: joid-virtual - <<: *master - # ------------------------------- - # None-CI PODs - # ------------------------------- - - orange-pod1: - slave-label: orange-pod1 - <<: *master - - cengn-pod1: - slave-label: cengn-pod1 - <<: *master + <<: *euphrates + # ------------------------------- # scenarios # ------------------------------- @@ -53,18 +42,12 @@ auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-ha': auto-trigger-name: 'daily-trigger-disabled' - - 'os-onos-nofeature-ha': - auto-trigger-name: 'daily-trigger-disabled' - 'os-odl_l2-nofeature-noha': auto-trigger-name: 'daily-trigger-disabled' - - 'os-onos-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' - - 'os-onos-sfc-ha': - auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-ha': - auto-trigger-name: 'daily-trigger-disabled' + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-ocl-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'k8-nosdn-nofeature-noha': auto-trigger-name: 'daily-trigger-disabled' - 'k8-nosdn-lb-noha': @@ -151,7 +134,7 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' -# 1.dovetail only master by now, not sync with A/B/C branches +# 1.dovetail only euphrates by now, not sync with A/B/C branches # 2.here the stream means the SUT stream, dovetail stream is defined in # its own job # 3.only debug testsuite here(includes basic testcase, @@ -234,191 +217,58 @@ ######################## # trigger macros ######################## -# os-nosdn-nofeature-ha trigger - branch: master +# os-nosdn-nofeature-ha trigger - branch: euphrates - trigger: - name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger' + name: 'joid-os-nosdn-nofeature-ha-baremetal-euphrates-trigger' triggers: - timed: '5 2 * * *' +# os-odl_l2-nofeature-ha trigger - branch: euphrates - trigger: - name: 'joid-os-nosdn-nofeature-ha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-nosdn-nofeature-ha-orange-pod1-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-nosdn-nofeature-ha-cengn-pod1-master-trigger' - triggers: - - timed: '' -# os-odl_l2-nofeature-ha trigger - branch: master -- trigger: - name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger' + name: 'joid-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger' triggers: - timed: '5 7 * * *' +# os-nosdn-lxd-noha trigger - branch: euphrates - trigger: - name: 'joid-os-odl_l2-nofeature-ha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-odl_l2-nofeature-ha-cengn-pod1-master-trigger' - triggers: - - timed: '' -# os-onos-nofeature-ha trigger - branch: master -- trigger: - name: 'joid-os-onos-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '5 12 * * *' -- trigger: - name: 'joid-os-onos-nofeature-ha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-onos-nofeature-ha-orange-pod1-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-onos-nofeature-ha-cengn-pod1-master-trigger' - triggers: - - timed: '' -# os-onos-sfc-ha trigger - branch: master -- trigger: - name: 'joid-os-onos-sfc-ha-baremetal-master-trigger' - triggers: - - timed: '5 17 * * *' -- trigger: - name: 'joid-os-onos-sfc-ha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-onos-sfc-ha-orange-pod1-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-onos-sfc-ha-cengn-pod1-master-trigger' - triggers: - - timed: '' -# os-nosdn-lxd-noha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger' + name: 'joid-os-nosdn-lxd-noha-baremetal-euphrates-trigger' triggers: - timed: '5 22 * * *' +# os-nosdn-lxd-ha trigger - branch: euphrates - trigger: - name: 'joid-os-nosdn-lxd-noha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-nosdn-lxd-noha-orange-pod1-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-nosdn-lxd-noha-cengn-pod1-master-trigger' - triggers: - - timed: '' -# os-nosdn-lxd-ha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger' + name: 'joid-os-nosdn-lxd-ha-baremetal-euphrates-trigger' triggers: - timed: '5 10 * * *' +# os-nosdn-nofeature-noha trigger - branch: euphrates - trigger: - name: 'joid-os-nosdn-lxd-ha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-nosdn-lxd-ha-orange-pod1-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-nosdn-lxd-ha-cengn-pod1-master-trigger' - triggers: - - timed: '' -# os-nosdn-nofeature-noha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger' + name: 'joid-os-nosdn-nofeature-noha-baremetal-euphrates-trigger' triggers: - timed: '5 4 * * *' +# k8-nosdn-nofeature-noha trigger - branch: euphrates - trigger: - name: 'joid-os-nosdn-nofeature-noha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-nosdn-nofeature-noha-orange-pod1-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-nosdn-nofeature-noha-cengn-pod1-master-trigger' - triggers: - - timed: '' -# k8-nosdn-nofeature-noha trigger - branch: master -- trigger: - name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger' + name: 'joid-k8-nosdn-nofeature-noha-baremetal-euphrates-trigger' triggers: - timed: '5 15 * * *' +# k8-nosdn-lb-noha trigger - branch: euphrates - trigger: - name: 'joid-k8-nosdn-nofeature-noha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-k8-nosdn-nofeature-noha-orange-pod1-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-k8-nosdn-nofeature-noha-cengn-pod1-master-trigger' - triggers: - - timed: '' -# k8-nosdn-lb-noha trigger - branch: master -- trigger: - name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger' + name: 'joid-k8-nosdn-lb-noha-baremetal-euphrates-trigger' triggers: - timed: '5 20 * * *' +# k8-ovn-lb-noha trigger - branch: euphrates - trigger: - name: 'joid-k8-nosdn-lb-noha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-k8-nosdn-lb-noha-orange-pod1-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-k8-nosdn-lb-noha-cengn-pod1-master-trigger' - triggers: - - timed: '' -# k8-ovn-lb-noha trigger - branch: master -- trigger: - name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger' + name: 'joid-k8-ovn-lb-noha-baremetal-euphrates-trigger' triggers: - timed: '5 17 * * *' +# os-nosdn-openbaton-ha trigger - branch: euphrates - trigger: - name: 'joid-k8-ovn-lb-noha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-k8-ovn-lb-noha-orange-pod1-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-k8-ovn-lb-noha-cengn-pod1-master-trigger' - triggers: - - timed: '' - -# os-nosdn-openbaton-ha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger' + name: 'joid-os-nosdn-openbaton-ha-baremetal-euphrates-trigger' triggers: - timed: '5 25 * * *' +# os-ocl-nofeature-ha trigger - branch: euphrates - trigger: - name: 'joid-os-nosdn-openbaton-ha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-nosdn-openbaton-ha-orange-pod1-master-trigger' + name: 'joid-os-ocl-nofeature-ha-baremetal-euphrates-trigger' triggers: - - timed: '' + - timed: '5 13 * * *' +# os-ocl-nofeature-ha trigger - branch: euphrates - trigger: - name: 'joid-os-nosdn-openbaton-ha-cengn-pod1-master-trigger' + name: 'joid-os-ocl-nofeature-noha-baremetal-euphrates-trigger' triggers: - - timed: '' + - timed: '5 17 * * *' -- 2.16.6