summaryrefslogtreecommitdiffstats
path: root/jjb/daisy4nfv
diff options
context:
space:
mode:
authorJulien <zhang.jun3g@zte.com.cn>2018-03-12 09:13:25 +0800
committerJulien <zhang.jun3g@zte.com.cn>2018-03-12 09:13:25 +0800
commitbb2508b0f971de18385fc65b82c5ae0e32c83915 (patch)
tree9cd9a23470bd3e4b4c808b38f0d4f572850c6f11 /jjb/daisy4nfv
parentab834c5f7fd4ed6ba578b6a36a8fd98ae4085823 (diff)
Define parameters for triggering jobs
In https://wiki.jenkins.io/display/JENKINS/Plugins+affected+by+fix+for+SECURITY-170, it indicates that: only build parameters that have been explicitly defined in a job's configuration will be available by default at build time. Any other arbitrary parameters added to a build by plugins will not be available by default. It has been tested in sandbox.opnfv.org that only defined parameters can be passed to the triggered jobs. For parameters required by TESTAPI are common to all the projectes, including installers, Functest, and Yardstick, it is convenient to define a common macro and used by others. Change-Id: Iac1da85445e1b5d75109ccd64b174f35151b9969 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Diffstat (limited to 'jjb/daisy4nfv')
-rw-r--r--jjb/daisy4nfv/daisy-daily-jobs.yml17
1 files changed, 2 insertions, 15 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index c354ca655..a9a0da2ee 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -117,18 +117,7 @@
- '{installer}-defaults'
- '{slave-label}-defaults':
installer: '{installer}'
- - string:
- name: DEPLOY_SCENARIO
- default: '{scenario}'
- - string:
- name: INSTALLER_VERSION
- default: ''
- - string:
- name: UPSTREAM_JOB_NAME
- default: ''
- - string:
- name: UPSTREAM_BUILD_ID
- default: ''
+ - 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
@@ -212,9 +201,7 @@
- '{installer}-defaults'
- '{slave-label}-defaults':
installer: '{installer}'
- - string:
- name: DEPLOY_SCENARIO
- default: 'os-nosdn-nofeature-ha'
+ - 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
- string: