summaryrefslogtreecommitdiffstats
path: root/jjb/daisy4nfv
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2017-02-08 10:03:58 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-08 10:03:58 +0000
commitbaf1364c9d161144c653987f91e2fdf14753f25f (patch)
treeb511834c85de1c52c092e5369af59c56c9b587bd /jjb/daisy4nfv
parent30433d79b4aa1fe22cd4ed04ba0e4d1aef9de97a (diff)
parent2ed1b67a5fa1ce088b7b06cc9d1ed5421344d64c (diff)
Merge "Add daisy installer default parameters"
Diffstat (limited to 'jjb/daisy4nfv')
-rw-r--r--jjb/daisy4nfv/daisy-project-jobs.yml13
1 files changed, 12 insertions, 1 deletions
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index 9df732f5d..f712adb0a 100644
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -2,6 +2,7 @@
# Add daily jobs, for buidoing, deploying and testing
# TODO:
# - [ ] Add yardstick and functest for test stage
+# - [x] Use daisy-baremetal-defauls for choosing baremetal deployment
######################################################################
#############################
@@ -28,7 +29,7 @@
- 'build':
slave-label: 'opnfv-build-centos'
- 'deploy':
- slave-label: 'opnfv-build-centos'
+ slave-label: 'daisy-baremetal'
- 'test':
slave-label: 'opnfv-build-centos'
jobs:
@@ -65,6 +66,7 @@
project: '{project}'
branch: '{branch}'
- 'opnfv-build-centos-defaults'
+ - 'daisy-defaults'
- '{installer}-project-parameter':
gs-pathname: '{gs-pathname}'
@@ -155,6 +157,15 @@
- project-parameter:
project: '{project}'
branch: '{branch}'
+ - 'daisy-defaults'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-ha'
+ - 'daisy-defaults'
- '{slave-label}-defaults'
- '{installer}-project-parameter':
gs-pathname: '{gs-pathname}'