diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2015-07-14 08:57:48 +0000 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2015-07-14 09:01:13 +0000 |
| commit | b3ed9d5b9c2b075f0333eb5098809f3d8286ba8f (patch) | |
| tree | e8cd9098b8a60a23caeedf3da6624effc6d841e7 /jjb/pharos | |
| parent | 59487d0f870a4846a9bd67ef38752eacf9b232f8 (diff) | |
create merge jobs for pharos for master and stable/arno
JIRA: OCTO-86
Change-Id: I43b039297c39699d5fac5c14eab8ac3e988f8121
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'jjb/pharos')
| -rw-r--r-- | jjb/pharos/pharos.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index 4a414ab0e..c7638997f 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -6,7 +6,7 @@ jobs: - 'pharos-test' - 'pharos-daily-{stream}' - - 'pharos-merge' + - 'pharos-merge-{stream}' - 'pharos-verify-{stream}' # stream: branch with - in place of / (eg. stable-arno) @@ -140,7 +140,7 @@ !include-raw ../opnfvdocs/docu-build.sh - job-template: - name: 'pharos-merge' + name: 'pharos-merge-{stream}' node: master @@ -160,7 +160,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' scm: - gerrit-trigger-scm: @@ -183,7 +183,7 @@ project-pattern: 'pharos' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: |