diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-09-25 12:58:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-25 12:58:05 +0000 |
| commit | 97ae2baff7af396ff2a90e7838fe0c50ef2dfce8 (patch) | |
| tree | db7fc11dd271f264ffbcea2ce80dc5877f1abea6 | |
| parent | 5f70d3e9480e1fd1608b0e6a63482622e1bc1dbf (diff) | |
| parent | 67a9ca8836478c7607e780fc1314fce59d8fd913 (diff) | |
Merge "Enable daisy euphrates jobs of daily and functest"
| -rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 16 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yml | 18 |
2 files changed, 31 insertions, 3 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index a9249eaf8..7b753836d 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -37,6 +37,12 @@ - virtual: slave-label: daisy-virtual <<: *master + - baremetal: + slave-label: daisy-baremetal + <<: *euphrates + - virtual: + slave-label: daisy-virtual + <<: *euphrates #-------------------------------- # None-CI PODs #-------------------------------- @@ -225,6 +231,11 @@ name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger' triggers: - timed: '0 0 * * *' +# Basic NOHA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-euphrates-trigger' + triggers: + - timed: '' # ODL Scenarios - trigger: name: 'daisy-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger' @@ -238,6 +249,11 @@ name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger' triggers: - timed: '0 0 * * *' +# Basic NOHA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger' + triggers: + - timed: '' # ODL Scenarios - trigger: name: 'daisy-os-odl-nofeature-ha-virtual-daily-euphrates-trigger' diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index 443c63958..04a293618 100644 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -122,6 +122,14 @@ slave-label: daisy-virtual installer: daisy <<: *master + - baremetal: + slave-label: daisy-baremetal + installer: daisy + <<: *euphrates + - virtual: + slave-label: daisy-virtual + installer: daisy + <<: *euphrates # netvirt 3rd party ci - virtual: slave-label: odl-netvirt-virtual @@ -160,15 +168,19 @@ <<: *euphrates - zte-pod2: slave-label: '{pod}' - installer: fuel + installer: daisy <<: *master + - zte-pod2: + slave-label: '{pod}' + installer: daisy + <<: *euphrates - zte-pod3: slave-label: '{pod}' - installer: fuel + installer: daisy <<: *master - zte-pod3: slave-label: '{pod}' - installer: fuel + installer: daisy <<: *euphrates # PODs for verify jobs triggered by each patch upload # - ool-virtual1: |