Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "JJB 2.0.X does not allow scenario to be passed here"
[releng.git]
/
jjb
/
fuel
/
fuel-weekly-jobs.yml
diff --git
a/jjb/fuel/fuel-weekly-jobs.yml
b/jjb/fuel/fuel-weekly-jobs.yml
index
2544e92
..
aca625d
100644
(file)
--- a/
jjb/fuel/fuel-weekly-jobs.yml
+++ b/
jjb/fuel/fuel-weekly-jobs.yml
@@
-16,8
+16,8
@@
branch: '{stream}'
disabled: false
gs-pathname: ''
branch: '{stream}'
disabled: false
gs-pathname: ''
- euphrates: &euphrates
- stream:
euphrates
+ fraser: &fraser
+ stream:
fraser
branch: 'stable/{stream}'
disabled: false
gs-pathname: '/{stream}'
branch: 'stable/{stream}'
disabled: false
gs-pathname: '/{stream}'
@@
-35,10
+35,10
@@
<<: *master
- baremetal:
slave-label: fuel-baremetal
<<: *master
- baremetal:
slave-label: fuel-baremetal
- <<: *
euphrates
+ <<: *
fraser
- virtual:
slave-label: fuel-virtual
- virtual:
slave-label: fuel-virtual
- <<: *
euphrates
+ <<: *
fraser
# -------------------------------
# scenarios
# -------------------------------
# -------------------------------
# scenarios
# -------------------------------
@@
-153,13
+153,10
@@
gs-pathname: '{gs-pathname}'
- '{slave-label}-defaults':
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- '{slave-label}-defaults':
installer: '{installer}'
+ - testapi-parameter
- string:
name: DEPLOY_SCENARIO
default: 'os-odl-nofeature-ha'
- string:
name: DEPLOY_SCENARIO
default: 'os-odl-nofeature-ha'
- - string:
- name: DEPLOY_TIMEOUT
- default: '150'
- description: 'Deployment timeout in minutes'
scm:
- git-scm
scm:
- git-scm
@@
-171,6
+168,7
@@
builders:
- description-setter:
description: "Built on $NODE_NAME"
builders:
- description-setter:
description: "Built on $NODE_NAME"
+ - track-begin-timestamp
- shell:
!include-raw-escape: ./fuel-deploy.sh
- shell:
!include-raw-escape: ./fuel-deploy.sh
@@
-178,6
+176,7
@@
- email:
recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
- email-jenkins-admins-on-failure
- email:
recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
- email-jenkins-admins-on-failure
+ - report-provision-result
########################
# trigger macros
########################
# trigger macros