From 1afb0ddd6faa02d364e9537ba78943e166039cc1 Mon Sep 17 00:00:00 2001
From: Julien <zhang.jun3g@zte.com.cn>
Date: Thu, 25 May 2017 18:01:50 +0800
Subject: 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>
---
 jjb/daisy4nfv/daisy-project-jobs.yml    | 7 +++----
 jjb/daisy4nfv/daisy4nfv-merge-jobs.yml  | 1 +
 jjb/daisy4nfv/daisy4nfv-verify-jobs.yml | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'jjb/daisy4nfv')

diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index e631ee9b9..0a9d43d25 100644
--- 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 9e7b867af..c676e8257 100644
--- 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 a0ec2ebd7..302bbfdca 100644
--- 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}'
-- 
cgit 1.2.3-korg