From 2cc58f305e99235f4da7688fa476636529c6d861 Mon Sep 17 00:00:00 2001 From: MatthewLi Date: Fri, 24 Jul 2015 08:10:26 +0000 Subject: create merge job for genesis master and stable/arno JIRA: OCTO-84 Change-Id: I50281b4e88f0d6338164f586f1cb931247ccf907 Signed-off-by: MatthewLi --- jjb/genesis/genesis-fuel.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'jjb/genesis/genesis-fuel.yml') diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml index b4b428b19..f6b2d0b7e 100644 --- a/jjb/genesis/genesis-fuel.yml +++ b/jjb/genesis/genesis-fuel.yml @@ -11,7 +11,7 @@ jobs: - 'genesis-fuel-verify-{stream}' - - 'genesis-fuel-merge' + - 'genesis-fuel-merge-{stream}' - 'genesis-fuel-daily-{stream}' - 'genesis-fuel-build-{stream}' - 'genesis-fuel-deploy-{stream}' @@ -99,7 +99,7 @@ - 'fuel-workspace-cleanup' - job-template: - name: 'genesis-fuel-merge' + name: 'genesis-fuel-merge-{stream}' project-type: freestyle @@ -122,7 +122,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' - fuel-parameter: installer: '{installer}' gs-pathname: '' @@ -148,7 +148,7 @@ project-pattern: 'genesis' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' file-paths: - compare-type: ANT pattern: 'common/**' -- cgit 1.2.3-korg