summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-05-15 15:34:34 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-05-15 15:48:42 +0200
commitbbf762bafbf75a3869f2b25412baa46bb0931609 (patch)
tree2b9127fb28b8868effada15447c19545bb815bb2 /jjb
parent6fea79f2fa60b1457376f1164b4f33da1df704a9 (diff)
Remove unnecessary git parameters from foreman parameter macro
JIRA: OCTO-47 Change-Id: I59d7323b972dea99efad09e514d87f5ccb054f28 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/genesis/genesis-foreman.yml56
1 files changed, 21 insertions, 35 deletions
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 852264461..5fd1135d1 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -47,10 +47,10 @@
parameters:
- project-parameter:
project: '{project}'
- - foreman-parameters:
- installer: '{installer}'
- gerrit-parameter:
branch: 'master'
+ - foreman-parameter:
+ installer: '{installer}'
scm:
- gerrit-trigger-scm:
@@ -105,10 +105,10 @@
parameters:
- project-parameter:
project: '{project}'
- - foreman-parameters:
- installer: '{installer}'
- gerrit-parameter:
branch: 'master'
+ - foreman-parameter:
+ installer: '{installer}'
scm:
- gerrit-trigger-scm:
@@ -153,19 +153,17 @@
parameters:
- project-parameter:
project: '{project}'
- - foreman-parameters:
+ - foreman-parameter:
installer: '{installer}'
scm:
- - git:
- skip-tag: true
- url: $GIT_BASE
- branches:
- - $GERRIT_BRANCH
- refspec: $GERRIT_REFSPEC
+ - git-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: ''
+ branch: master
triggers:
- - pollscm: '@midnight'
+ - timed: '@midnight'
logrotate:
daysToKeep: 30
@@ -202,16 +200,14 @@
parameters:
- project-parameter:
project: '{project}'
- - foreman-parameters:
+ - foreman-parameter:
installer: '{installer}'
scm:
- - git:
- skip-tag: true
- url: $GIT_BASE
- branches:
- - $GERRIT_BRANCH
- refspec: $GERRIT_REFSPEC
+ - git-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: ''
+ branch: master
builders:
- 'foreman-build'
@@ -235,16 +231,14 @@
parameters:
- project-parameter:
project: '{project}'
- - foreman-parameters:
+ - foreman-parameter:
installer: '{installer}'
scm:
- - git:
- skip-tag: true
- url: $GIT_BASE
- branches:
- - $GERRIT_BRANCH
- refspec: $GERRIT_REFSPEC
+ - git-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: ''
+ branch: master
builders:
- 'foreman-deploy'
@@ -253,7 +247,7 @@
# parameter macros
########################
- parameter:
- name: foreman-parameters
+ name: foreman-parameter
parameters:
- string:
name: INSTALLER
@@ -272,14 +266,6 @@
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
- string:
- name: GERRIT_BRANCH
- default: origin/master
- description: "Branch to build, deploy and test."
- - string:
- name: GERRIT_REFSPEC
- default: refs/heads/master
- description: "Refspec to retrieve."
- - string:
name: GS_URL
default: artifacts.opnfv.org/$PROJECT/$INSTALLER
description: "URL to Google Storage."