diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2019-08-08 10:48:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-08-08 10:48:10 +0000 |
| commit | 84a8ac5e17f73e84befde3bca4560a36077c78fe (patch) | |
| tree | 706128fc32f2727b72af593f98e94cee68d7293a /jjb | |
| parent | 9b5a8ecafb5e7cc1684977ae49b987d5b407b382 (diff) | |
| parent | d158be56351fbcbbc6d086c8984bbf8e900099d5 (diff) | |
Merge "Add CSIT rls1908 branch"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit-func.yaml | 12 | ||||
| -rw-r--r-- | jjb/csit/csit-hc2vpp.yaml | 6 | ||||
| -rw-r--r-- | jjb/csit/csit-perf.yaml | 12 | ||||
| -rw-r--r-- | jjb/csit/csit-tox.yaml | 2 | ||||
| -rw-r--r-- | jjb/csit/csit-vpp-device.yaml | 18 | ||||
| -rw-r--r-- | jjb/csit/csit.yaml | 10 |
6 files changed, 25 insertions, 35 deletions
diff --git a/jjb/csit/csit-func.yaml b/jjb/csit/csit-func.yaml index b101b09ee..c9a98631a 100644 --- a/jjb/csit/csit-func.yaml +++ b/jjb/csit/csit-func.yaml @@ -36,20 +36,18 @@ - master: branch: 'master' branch-id: 'oper' - - '1904': - branch: 'rls1904' - branch-id: 'oper-rls1904' + - '1908': + branch: 'rls1908' + branch-id: 'oper-rls1908' stream: - master: branch: 'master' - - '1807': - branch: 'rls1807' - - '1810': - branch: 'rls1810' - '1901': branch: 'rls1901' - '1904': branch: 'rls1904' + - '1908': + branch: 'rls1908' - job-template: name: 'csit-vpp-verify-{stream_timed}-{os}-weekly' diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml index aeead71e3..9944e9233 100644 --- a/jjb/csit/csit-hc2vpp.yaml +++ b/jjb/csit/csit-hc2vpp.yaml @@ -17,15 +17,15 @@ stream: - master: branch: 'master' - - '1810': - branch: 'rls1810' - branch-id: 'oper-rls1810' - '1901': branch: 'rls1901' branch-id: 'oper-rls1901' - '1904': branch: 'rls1904' branch-id: 'oper-rls1904' + - '1908': + branch: 'rls1908' + branch-id: 'oper-rls1908' - job-template: name: 'csit-hc2vpp-verify-func-{stream}-{os}' diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index 538ca1fe5..1b253d016 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -54,14 +54,6 @@ branch: 'master' branch-id: 'oper' executor: 'ubuntu1804-us' - - '1807': - branch: 'rls1807' - branch-id: 'oper-rls1807' - executor: 'ubuntu1604-basebuild-8c-32g' - - '1810': - branch: 'rls1810' - branch-id: 'oper-rls1810' - executor: 'ubuntu1604-basebuild-8c-32g' - '1901': branch: 'rls1901' branch-id: 'oper-rls1901' @@ -70,6 +62,10 @@ branch: 'rls1904' branch-id: 'oper-rls1904' executor: 'ubuntu1804-us' + - '1908': + branch: 'rls1908' + branch-id: 'oper-rls1908' + executor: 'ubuntu1804-us' build-artifact-num-to-keep: 10 node-arch: diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml index 83816629f..a4c3182b3 100644 --- a/jjb/csit/csit-tox.yaml +++ b/jjb/csit/csit-tox.yaml @@ -14,6 +14,8 @@ branch: 'rls1901' - '1904': branch: 'rls1904' + - '1908': + branch: 'rls1908' - job-template: name: 'csit-verify-tox-{stream}' diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml index 1f108838b..538136d10 100644 --- a/jjb/csit/csit-vpp-device.yaml +++ b/jjb/csit/csit-vpp-device.yaml @@ -36,35 +36,29 @@ - master: branch: 'master' branch-id: 'oper' - - '1904': - branch: 'rls1904' - branch-id: 'oper-rls1904' + - '1908': + branch: 'rls1908' + branch-id: 'oper-rls1908' stream: - master: branch: 'master' branch-id: 'oper' - - '1810': - branch: 'rls1810' - branch-id: 'oper-rls1810' - '1901': branch: 'rls1901' branch-id: 'oper-rls1901' - '1904': branch: 'rls1904' branch-id: 'oper-rls1904' + - '1908': + branch: 'rls1908' + branch-id: 'oper-rls1908' # exclude: -# - stream: '1810' -# os: 'ubuntu1804' -# node-arch: '1n-tx2' # - stream: '1901' # os: 'ubuntu1804' # node-arch: '1n-tx2' # - stream: '1904' # os: 'ubuntu1804' # node-arch: '1n-tx2' -# - stream_timed: '1904' -# os: 'ubuntu1804' -# node-arch: '1n-tx2' - job-template: name: 'csit-vpp-device-{stream}-{os}-{node-arch}' diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 9a6c6a980..8b2207127 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -33,22 +33,22 @@ - master: branch: 'master' executor: 'ubuntu1804-us' - - '1904': - branch: 'rls1904' + - '1908': + branch: 'rls1908' executor: 'ubuntu1804-us' stream: - master: branch: 'master' executor: 'ubuntu1804-us' - - '1810': - branch: 'rls1810' - executor: 'ubuntu1604-basebuild-4c-4g' - '1901': branch: 'rls1901' executor: 'ubuntu1604-basebuild-4c-4g' - '1904': branch: 'rls1904' executor: 'ubuntu1804-us' + - '1908': + branch: 'rls1908' + executor: 'ubuntu1804-us' - project: name: csit-view |