summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien <zhang.jun3g@zte.com.cn>2017-02-05 23:45:45 +0800
committerJulien <zhang.jun3g@zte.com.cn>2017-02-07 11:44:53 +0800
commit2ed1b67a5fa1ce088b7b06cc9d1ed5421344d64c (patch)
tree1e61f39c4dc19b25bb9f90221d54bba1cb197a60
parent56b4b6eaabd5a746bf33504cf1913c9c10df2a92 (diff)
Add daisy installer default parameters
Add default settings for installer and slaves Use baremetal deployment for daily Use virtual deployment for merge JIRA: DAISY-27 Change-Id: Ia00343225656c02aa292ee89d153f2e047c994b0 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
-rw-r--r--jjb/daisy4nfv/daisy-project-jobs.yml13
-rw-r--r--jjb/global/installer-params.yml13
-rw-r--r--jjb/global/slave-params.yml35
3 files changed, 60 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}'
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 6e965a9cb..c3e775681 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -89,6 +89,19 @@
name: CPU_ARCHITECTURE
default: 'amd64'
description: "CPU Architecture to use for Ubuntu distro "
+
+- parameter:
+ name: 'daisy-defaults'
+ parameters:
+ - string:
+ name: INSTALLER_IP
+ default: '10.20.0.2'
+ description: 'IP of the installer'
+ - string:
+ name: INSTALLER_TYPE
+ default: daisy
+ description: 'Installer used for deploying OPNFV on this POD'
+
- parameter:
name: 'infra-defaults'
parameters:
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index c87fc289c..8fc0207da 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -178,6 +178,23 @@
name: EXTERNAL_NETWORK
default: ext-net
description: "External network floating ips"
+- parameter:
+ name: 'daisy-baremetal-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - zte-pod2
+ default-slaves:
+ - zte-pod2
+ - label:
+ name: SLAVE_LABEL
+ default: 'daisy-baremetal'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
#####################################################
# Parameters for CI virtual PODs
#####################################################
@@ -239,6 +256,24 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+ name: 'daisy-virtual-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - zte-virtual1
+ - zte-virtual2
+ default-slaves:
+ - zte-virtual1
+ - label:
+ name: SLAVE_LABEL
+ default: 'daisy-virtual'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
#####################################################
# Parameters for build slaves
#####################################################