diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2017-09-18 07:32:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-18 07:32:39 +0000 |
| commit | cf7a4aa78910d8c401d018a769863097e63b7f4a (patch) | |
| tree | 794c5f215baf32639be1abd77c421e3833be17f9 | |
| parent | f9f7289953029b9d9b0765a8647fc0e847975879 (diff) | |
| parent | a13b9085b135ff40d73565aee8243757953990fc (diff) | |
Merge "Enable jobs for stable/euphrates branch"
| -rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 33 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy-project-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-verify-jobs.yml | 2 |
4 files changed, 40 insertions, 3 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index 9a680e7b8..a9249eaf8 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -19,6 +19,12 @@ branch: '{stream}' disabled: false gs-pathname: '' + euphrates: &euphrates + stream: euphrates + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- @@ -210,3 +216,30 @@ name: 'daisy-os-odl-nofeature-ha-virtual-daily-master-trigger' triggers: - timed: '0 12 * * *' + +#----------------------------------------------- +# Triggers for job running on daisy-baremetal against euphrates branch +#----------------------------------------------- +# Basic HA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger' + triggers: + - timed: '0 0 * * *' +# ODL Scenarios +- trigger: + name: 'daisy-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger' + triggers: + - timed: '0 20 * * *' +#----------------------------------------------- +# Triggers for job running on daisy-virtual against euphrates branch +#----------------------------------------------- +# Basic HA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger' + triggers: + - timed: '0 0 * * *' +# ODL Scenarios +- trigger: + name: 'daisy-os-odl-nofeature-ha-virtual-daily-euphrates-trigger' + triggers: + - timed: '0 20 * * *' diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml index bcb89105e..8ecee7b54 100644 --- a/jjb/daisy4nfv/daisy-project-jobs.yml +++ b/jjb/daisy4nfv/daisy-project-jobs.yml @@ -20,6 +20,10 @@ branch: '{stream}' gs-pathname: '' disabled: false + - euphrates: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false phase: - 'build': diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml index 97d830f9f..23c6c7b1c 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml @@ -18,7 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - danube: + - euphrates: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: true @@ -57,7 +57,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{alias}-merge-(master|danube)' + - '{alias}-merge-(master|euphrates)' block-level: 'NODE' scm: diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml index d8404f3c3..2cf68a99a 100644 --- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml @@ -15,7 +15,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - danube: + - euphrates: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false |