summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-08-24 22:26:09 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-08-24 22:26:09 +0200
commita93f285a35bd9be3794a31ae04a62a902ad93bc5 (patch)
tree660c7678f3e248c4f958f7324dd144402738ae71
parent74402592ba9899b6ea3a507d2eb14ea6d94852c5 (diff)
Try doing foreman virtual deploy as a separate job
Change-Id: I293d08233a5f1edab85d109c017a416062becc84 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/genesis/genesis-foreman.yml48
1 files changed, 35 insertions, 13 deletions
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 77660c2ad..50b84fd2d 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -97,9 +97,6 @@
builders:
- 'foreman-build'
- 'foreman-workspace-cleanup'
- - trigger-builds:
- - project: 'genesis-foreman-deploy-virtual-{stream}'
- git-revision: true
- job-template:
name: 'genesis-foreman-merge-{stream}'
@@ -370,8 +367,6 @@
project-type: freestyle
- disabled: false
-
node: opnfv-jump-1
logrotate:
@@ -383,19 +378,46 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- foreman-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- - string:
- name: GIT_BASE
- default: ssh://gerrit.opnfv.org:29418/$PROJECT
- description: "Used for overriding the GIT URL coming from parameters macro."
-
scm:
- - git-scm:
+ - gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ wrappers:
+ - ssh-agent-credentials:
+ user: '{ssh-credentials}'
+
+ triggers:
+ - gerrit:
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: 'genesis'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ file-paths:
+ - compare-type: ANT
+ pattern: 'common/**'
+ - compare-type: ANT
+ pattern: '{installer}/**'
+ dependency-jobs: 'genesis-foreman-verify-{stream}'
+
builders:
- 'foreman-deploy-virtual'