diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2015-07-24 08:10:26 +0000 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2015-07-24 08:13:33 +0000 |
| commit | 2cc58f305e99235f4da7688fa476636529c6d861 (patch) | |
| tree | 6a8e273b06a34bed50616ba5741947b5d0ed6fbb | |
| parent | 0e3af9d49a9249a59ec85c9a57b63804bca6facc (diff) | |
create merge job for genesis master and stable/arno
JIRA: OCTO-84
Change-Id: I50281b4e88f0d6338164f586f1cb931247ccf907
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
| -rw-r--r-- | jjb/genesis/genesis-foreman.yml | 8 | ||||
| -rw-r--r-- | jjb/genesis/genesis-fuel.yml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml index 5c6be56b3..3bc6b125a 100644 --- a/jjb/genesis/genesis-foreman.yml +++ b/jjb/genesis/genesis-foreman.yml @@ -11,7 +11,7 @@ jobs: - 'genesis-foreman-verify-{stream}' - - 'genesis-foreman-merge' + - 'genesis-foreman-merge-{stream}' - 'genesis-foreman-daily-{stream}' - 'genesis-foreman-build-{stream}' - 'genesis-foreman-deploy-{stream}' @@ -97,7 +97,7 @@ - 'foreman-workspace-cleanup' - job-template: - name: 'genesis-foreman-merge' + name: 'genesis-foreman-merge-{stream}' project-type: freestyle @@ -120,7 +120,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' - foreman-parameter: installer: '{installer}' gs-pathname: '' @@ -145,7 +145,7 @@ project-pattern: 'genesis' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' file-paths: - compare-type: ANT pattern: 'common/**' 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/**' |