diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-07-15 08:36:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-07-15 08:36:36 +0000 |
| commit | a5c8e537890a9177758b7756800406af9d606b42 (patch) | |
| tree | 3387480f778d0aec07c1ff91be03dfbef548a26e | |
| parent | 916b8cc0a5164752f6d8aa7d78522806047a89c0 (diff) | |
| parent | 30152ddac9d2d625fd2f0382702aac3a7835ff7a (diff) | |
Merge "create merge job for functest for master and stable/arno"
| -rw-r--r-- | jjb/functest/functest.yml | 8 |
1 files changed, 4 insertions, 4 deletions
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: |