Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[daisy] Fix the scenario in build-name
[releng.git]
/
jjb
/
daisy4nfv
/
daisy-daily-jobs.yml
diff --git
a/jjb/daisy4nfv/daisy-daily-jobs.yml
b/jjb/daisy4nfv/daisy-daily-jobs.yml
index
2eb27a6
..
e04df12
100644
(file)
--- a/
jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/
jjb/daisy4nfv/daisy-daily-jobs.yml
@@
-121,6
+121,9
@@
- 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
- 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: '{scenario}'
builders:
- description-setter:
builders:
- description-setter:
@@
-155,9
+158,6
@@
- condition-kind: regex-match
regex: 'baremetal'
label: '{pod}'
- condition-kind: regex-match
regex: 'baremetal'
label: '{pod}'
- - condition-kind: regex-match
- regex: 'master'
- label: '{stream}'
steps:
- trigger-builds:
- project: 'yardstick-daisy-{pod}-daily-{stream}'
steps:
- trigger-builds:
- project: 'yardstick-daisy-{pod}-daily-{stream}'
@@
-207,6
+207,7
@@
- 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
- 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
+ - 'deploy-scenario'
- string:
name: DEPLOY_TIMEOUT
default: '150'
- string:
name: DEPLOY_TIMEOUT
default: '150'
@@
-240,7
+241,7
@@
- trigger:
name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- trigger:
name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '
0 12 * * *
'
+ - timed: ''
# Basic NOHA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
# Basic NOHA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
@@
-250,7
+251,7
@@
- trigger:
name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- trigger:
name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '
0 18 * * *
'
+ - timed: ''
# ovs_dpdk Scenarios
- trigger:
name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-master-trigger'
# ovs_dpdk Scenarios
- trigger:
name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-master-trigger'
@@
-288,7
+289,7
@@
- trigger:
name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
triggers:
- trigger:
name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
triggers:
- - timed: '0 0 * * *'
+ - timed: '0 0
,6
* * *'
# Basic NOHA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
# Basic NOHA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
@@
-298,7
+299,7
@@
- trigger:
name: 'daisy-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
triggers:
- trigger:
name: 'daisy-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
triggers:
- - timed: '0
20
* * *'
+ - timed: '0
12,18
* * *'
# ovs_dpdk Scenarios
- trigger:
name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger'
# ovs_dpdk Scenarios
- trigger:
name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger'