diff options
-rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 79 | ||||
-rw-r--r-- | jjb/daisy4nfv/daisy-project-jobs.yml | 10 | ||||
-rw-r--r-- | jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | 4 | ||||
-rw-r--r-- | jjb/daisy4nfv/daisy4nfv-verify-jobs.yml | 2 |
4 files changed, 60 insertions, 35 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index cc2dc5a2f..2eb27a663 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -20,8 +20,8 @@ branch: '{stream}' disabled: false gs-pathname: '' - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -29,21 +29,22 @@ # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- - # CI PODs - # ------------------------------- pod: + # ------------------------------- + # CI PODs + # ------------------------------- - baremetal: slave-label: daisy-baremetal <<: *master - virtual: slave-label: daisy-virtual <<: *master - # - baremetal: - # slave-label: daisy-baremetal - # <<: *euphrates - # - virtual: - # slave-label: daisy-virtual - # <<: *euphrates + - baremetal: + slave-label: daisy-baremetal + <<: *fraser + - virtual: + slave-label: daisy-virtual + <<: *fraser # ------------------------------- # None-CI PODs # ------------------------------- @@ -53,9 +54,9 @@ - zte-pod9: slave-label: zte-pod9 <<: *master - # ------------------------------- - # None-CI PODs - # ------------------------------- + - zte-pod9: + slave-label: zte-pod9 + <<: *fraser # ------------------------------- # scenarios @@ -191,9 +192,9 @@ use-build-blocker: true blocking-jobs: - 'daisy-kolla-build-.*' - - '{installer}-(build|deploy|test)-daily-(euphrates|master)' - - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' - - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' + - '{installer}-(build|deploy|test)-daily-(fraser|master)' + - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' + - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' block-level: 'NODE' parameters: @@ -281,50 +282,50 @@ - timed: '' # ---------------------------------------------- -# Triggers for job running on daisy-baremetal against euphrates branch +# Triggers for job running on daisy-baremetal against fraser branch # ---------------------------------------------- # Basic HA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger' triggers: - timed: '0 0 * * *' # Basic NOHA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' # ODL Scenarios - trigger: - name: 'daisy-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-odl-nofeature-ha-baremetal-daily-fraser-trigger' triggers: - timed: '0 20 * * *' # ovs_dpdk Scenarios - trigger: - name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' # ---------------------------------------------- -# Triggers for job running on daisy-virtual against euphrates branch +# Triggers for job running on daisy-virtual against fraser branch # ---------------------------------------------- # Basic HA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-fraser-trigger' triggers: - timed: '0 0 * * *' # Basic NOHA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger' triggers: - timed: '' # ODL Scenarios - trigger: - name: 'daisy-os-odl-nofeature-ha-virtual-daily-euphrates-trigger' + name: 'daisy-os-odl-nofeature-ha-virtual-daily-fraser-trigger' triggers: - timed: '0 20 * * *' # ovs_dpdk Scenarios - trigger: - name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-euphrates-trigger' + name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-fraser-trigger' triggers: - timed: '' @@ -335,7 +336,7 @@ - trigger: name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-master-trigger' triggers: - - timed: '0 10,20 * * *' + - timed: '0 20 * * *' # Basic HA Scenarios - trigger: name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-master-trigger' @@ -351,3 +352,27 @@ name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-master-trigger' triggers: - timed: '' + +# ---------------------------------------------- +# ZTE POD9 Triggers running against fraser branch +# ---------------------------------------------- +# ovs_dpdk Scenarios +- trigger: + name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '0 10 * * *' +# Basic HA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '' +# Basic NOHA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-noha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '' +# ODL Scenarios +- trigger: + name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '' diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml index c4edd7738..3ea74a9a8 100644 --- a/jjb/daisy4nfv/daisy-project-jobs.yml +++ b/jjb/daisy4nfv/daisy-project-jobs.yml @@ -21,7 +21,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -94,7 +94,7 @@ - email-jenkins-admins-on-failure - trigger: - name: 'daisy-kolla-build-euphrates-trigger' + name: 'daisy-kolla-build-fraser-trigger' triggers: - timed: '0 0 * * 0' @@ -218,9 +218,9 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{installer}-daily-(build|deploy|test)-(euphrates|master)' - - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' - - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' + - '{installer}-daily-(build|deploy|test)-(fraser|master)' + - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' + - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' block-level: 'NODE' scm: diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml index f304d0b95..3a0a59fc4 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml @@ -19,7 +19,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -60,7 +60,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{alias}-merge-(master|euphrates)' + - '{alias}-merge-(master|fraser)' block-level: 'NODE' scm: diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml index 4100990d4..777b67795 100644 --- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml @@ -16,7 +16,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false |