define default parameters for daisy

missing default INSTALLER_IP, BRIDGE parameters for
daisy-defaults
daisy-baremetal-defaults
daisy-virtual-defaults

Change-Id: I2632e5d10c8a269c025a923c4759ff18adf311a7
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>

diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index e631ee9..0a9d43d 100644 (file)
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -71,7 +71,7 @@
             project: '{project}'
             branch: '{branch}'
         - 'opnfv-build-centos-defaults'
-        - 'daisy-defaults'
+        - '{installer}-defaults'
         - '{installer}-project-parameter':
             gs-pathname: '{gs-pathname}'
 
@@ -157,7 +157,8 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
-        - 'daisy-defaults'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -165,8 +166,6 @@
         - 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/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 9e7b867..c676e82 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -164,6 +164,7 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
+        - '{installer}-defaults'
         - '{slave-label}-defaults'
         - '{alias}-merge-defaults':
             gs-pathname: '{gs-pathname}'

diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index a0ec2eb..302bbfd 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -144,6 +144,7 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
+        - '{installer}-defaults'
         - '{slave-label}-defaults'
         - '{alias}-verify-defaults':
             gs-pathname: '{gs-pathname}'

diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index fc9f34a..40fc42c 100644 (file)
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -95,12 +95,16 @@
     parameters:
         - string:
             name: INSTALLER_IP
-            default: '10.20.0.2'
+            default: '10.20.7.3'
             description: 'IP of the installer'
         - string:
             name: INSTALLER_TYPE
             default: daisy
             description: 'Installer used for deploying OPNFV on this POD'
+        - string:
+            name: BRIDGE
+            default: 'br7'
+            description: 'pxe bridge for booting of Fuel master'
 
 - parameter:
     name: 'infra-defaults'

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 44666a7..cdc08ea 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -204,6 +204,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'daisy-baremetal'
+        - string:
+            name: INSTALLER_IP
+            default: '10.20.11.2'
+            description: 'IP of the installer'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -283,6 +287,14 @@
         - label:
             name: SLAVE_LABEL
             default: 'daisy-virtual'
+        - string:
+            name: INSTALLER_IP
+            default: '10.20.11.2'
+            description: 'IP of the installer'
+        - string:
+            name: BRIDGE
+            default: 'daisy1'
+            description: 'pxe bridge for booting of Fuel master'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -593,7 +605,7 @@
             description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: INSTALLER_IP
-            default: '10.20.7.2'
+            default: '10.20.7.3'
             description: 'IP of the installer'
         - string:
             name: BRIDGE