summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2015-07-14 09:24:06 +0000
committerMatthewLi <matthew.lijun@huawei.com>2015-07-15 09:07:12 +0000
commit85b729b515037043e21bbbcf3128045af1979c5e (patch)
tree5cfd908355bd638fb0fca7f1dc0d323f70b14091 /jjb
parenta5c8e537890a9177758b7756800406af9d606b42 (diff)
create merge job for opnfvdocs for master and stable/arno
JIRA: OCTO-88 Change-Id: Ic9ff046f2c31be9d610be88942fe00bf62e8721c Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/opnfvdocs/opnfvdocs.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 2f927d5ce..b555ad182 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -2,7 +2,7 @@
name: opnfvdocs
jobs:
- 'opnfvdocs-daily-{stream}'
- - 'opnfvdocs-merge'
+ - 'opnfvdocs-merge-{stream}'
- 'opnfvdocs-verify-{stream}'
# stream: branch with - in place of / (eg. stable-helium)
@@ -111,7 +111,7 @@
!include-raw docu-build.sh
- job-template:
- name: 'opnfvdocs-merge'
+ name: 'opnfvdocs-merge-{stream}'
node: gce-opnfv-docker-1
@@ -131,7 +131,7 @@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
scm:
- gerrit-trigger-scm:
@@ -154,7 +154,7 @@
project-pattern: 'opnfvdocs'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
builders:
- shell: