diff options
| author |   C.J. Collier <cjcollier@linuxfoundation.org> | 2016-08-24 14:14:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-08-24 14:14:55 +0000 |
| commit | add65bec3bf6517e6ffd7eab66dc6dfa651cc5d3 (patch) | |
| tree | 2350d2d804593b0ad066d8cbdaa0c92e901f3ec3 /jjb | |
| parent | 0454251d2b2568d1b09a46ab9e7368cd0a2376f1 (diff) | |
| parent | 60e148d38c57948dc86c295905bd183abf313a37 (diff) | |
Merge "CIMANAGE-17: Prepare necessary CSIT jobs for VPP 1609 branch"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit-vpp-pylint.yaml | 11 | ||||
| -rw-r--r-- | jjb/csit/csit.yaml | 20 |
2 files changed, 24 insertions, 7 deletions
diff --git a/jjb/csit/csit-vpp-pylint.yaml b/jjb/csit/csit-vpp-pylint.yaml index cfe45639d..12e581c41 100644 --- a/jjb/csit/csit-vpp-pylint.yaml +++ b/jjb/csit/csit-vpp-pylint.yaml @@ -2,13 +2,20 @@ name: csit-validate jobs: - - 'csit-validate-pylint-master' + - 'csit-validate-pylint-{stream}' project: 'csit' branch: 'master' + stream: + - master: + branch: 'master' + - '1606': + branch: 'rls1606' + - '1609': + branch: 'rls1609' - job-template: - name: 'csit-validate-pylint-master' + name: 'csit-validate-pylint-{stream}' project-type: freestyle node: verify diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 806e90f70..3cddd21ff 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -5,8 +5,8 @@ jobs: - 'csit-vpp-perf-{stream}-{type}' - 'csit-vpp-functional-{stream}-virl' - - 'csit-vpp-verify-master-weekly' - - 'csit-vpp-verify-{stream}-semiweekly' + - 'csit-vpp-verify-{stream_timed}-weekly' + - 'csit-vpp-verify-{stream_timed}-semiweekly' - 'csit-vpp-verify-perf-master-nightly-all' project: 'csit' @@ -16,6 +16,13 @@ type: - all - long + stream_timed: + - master: + branch: 'master' + branch-id: 'oper' + - '1609': + branch: 'rls1609' + branch-id: 'oper-rls1609' stream: - master: branch: 'master' @@ -23,6 +30,9 @@ - '1606': branch: 'rls1606' branch-id: 'oper-rls1606' + - '1609': + branch: 'rls1609' + branch-id: 'oper-rls1609' - job-template: name: 'csit-vpp-functional-{stream}-virl' @@ -258,8 +268,8 @@ xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]' - job-template: - name: 'csit-vpp-verify-master-weekly' - description: 'Purpose of this job is to validate CSIT code against verified vpp build and create csit-verified branch in case of success.' + name: 'csit-vpp-verify-{stream_timed}-weekly' + description: 'Purpose of this job is to validate CSIT code of corresponding branch against verified vpp build from corresponding branch and create corresponding operational branch in case of success.' project-type: freestyle node: verify @@ -319,7 +329,7 @@ - job-template: - name: 'csit-vpp-verify-{stream}-semiweekly' + name: 'csit-vpp-verify-{stream_timed}-semiweekly' description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.' project-type: freestyle |