diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2015-06-09 11:02:36 +0800 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2015-06-09 11:10:36 +0800 |
| commit | e967bf1d250b450e03ffc027fa86a4b39584c442 (patch) | |
| tree | 4f42fa002d59b6435c99bac7cccd4b2570963d4e | |
| parent | 88032532c10bcf93f16f5c3489d7bf8a7544cbf2 (diff) | |
create verify jobs for functest for master and stable/arno
JIRA: OCTO-82
daily, merge, functest-{pod} and other jobs for stable/arno should be created after some discussion
Change-Id: I17fd4783140d584bef2b73971a1ba10dfdb06576
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
| -rw-r--r-- | jjb/functest/functest.yml | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index d2a5bc9ec..f441594c8 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -1,3 +1,6 @@ +################################### +# job configuration for functest +################################### - project: name: functest @@ -11,19 +14,23 @@ - 'functest-odl-test' - 'functest-vims-test' - 'functest-vping-test' - - 'functest-daily-{stream}' + - 'functest-daily-master' - 'functest-merge' - - 'functest-verify' + - 'functest-verify-{stream}' - # stream: branch with - in place of / (eg. stable-helium) - # branch: branch (eg. stable/helium) + # stream: branch with - in place of / (eg. stable-arno) + # branch: branch (eg. stable/arno) stream: - master: branch: 'master' + - stable-arno: + branch: 'stable/arno' project: 'functest' somevar: 'foo' - +################################ +# job template +################################ - job-template: name: functest-openstack-bench-test @@ -138,7 +145,7 @@ - 'functest-all' - job-template: - name: 'functest-daily-{stream}' + name: 'functest-daily-master' node: master @@ -165,7 +172,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: '{branch}' + branch: master wrappers: - ssh-agent-credentials: @@ -185,7 +192,7 @@ - test-macro - job-template: - name: 'functest-verify' + name: 'functest-verify-{stream}' node: master @@ -201,7 +208,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -229,7 +236,7 @@ project-pattern: 'functest' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: |