From 30152ddac9d2d625fd2f0382702aac3a7835ff7a Mon Sep 17 00:00:00 2001
From: MatthewLi <matthew.lijun@huawei.com>
Date: Tue, 14 Jul 2015 09:12:49 +0000
Subject: create merge job for functest for master and stable/arno
JIRA: OCTO-87
Change-Id: Ib312449187a108528cc3ee9fe82c1fc1cedfb01a
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
---
jjb/functest/functest.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'jjb')
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 0d776065f..f0193e16b 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -26,7 +26,7 @@
- 'functest-vims-test-{pod}'
- 'functest-vping-test-{pod}'
- 'functest-daily-{stream}'
- - 'functest-merge'
+ - 'functest-merge-{stream}'
- 'functest-verify-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
@@ -354,7 +354,7 @@
!include-raw ../opnfvdocs/docu-build.sh
- job-template:
- name: 'functest-merge'
+ name: 'functest-merge-{stream}'
node: master
@@ -374,7 +374,7 @@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
scm:
- gerrit-trigger-scm:
@@ -397,7 +397,7 @@
project-pattern: 'functest'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
builders:
- shell:
--
cgit