summaryrefslogtreecommitdiffstats
path: root/jjb/fuel
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-20 09:27:30 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-22 06:44:22 +0000
commit02923529b6a032556764d479eba2e54f35ebad4b (patch)
tree474e513de1a8f25245f771900d2b888003a96534 /jjb/fuel
parent6b6f4bafc9c2a306d59acfb216caadd24f6516e6 (diff)
joid: Create jobs for virtual deployments in slave lf-virtual1
Change-Id: Ife7101bf138d8a7eedf671fe7bc7f71c85a87aad Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/fuel')
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml13
-rw-r--r--jjb/fuel/fuel-project-jobs.yml3
2 files changed, 4 insertions, 12 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 478dffb38..97d3bc5de 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -165,7 +165,8 @@
parameters:
- project-parameter:
project: '{project}'
- - '{pod}-defaults'
+ - '{pod}-defaults':
+ installer: '{installer}'
- '{installer}-defaults'
- string:
name: DEPLOY_SCENARIO
@@ -211,16 +212,6 @@
name: GS_URL
default: artifacts.opnfv.org/$PROJECT{gs-pathname}
description: "URL to Google Storage."
-- parameter:
- name: 'virtual-defaults'
- parameters:
- - label:
- name: SLAVE_LABEL
- default: 'fuel-deploy-virtual'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on these Jenkins Slaves'
########################
# trigger macros
########################
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index a8f940363..b3983986f 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -204,7 +204,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'fuel-deploy-virtual-defaults'
+ - 'virtual-defaults':
+ installer: '{installer}'
- '{installer}-defaults'
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'