summaryrefslogtreecommitdiffstats
path: root/jjb/csit
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2020-03-25 17:46:14 +0100
committerJan Gelety <jgelety@cisco.com>2020-03-27 10:47:28 +0100
commitb082bcf3bf0ccd29d0356b4b11537887eee30e0c (patch)
tree3463cd88c85dad361a1dfa972e0608ab8b1a7b1e /jjb/csit
parent8224b8404da42b47dcd9a3698f7e215264a23e43 (diff)
Add CSIT rls1908_2 branch
+ keep csit-vpp-perf-verify-1908_1-{node-arch} jobs for some time Change-Id: I172ab711b2934ba916eb9c1324440bc8cf7bab05 Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'jjb/csit')
-rw-r--r--jjb/csit/csit-perf.yaml25
-rw-r--r--jjb/csit/csit-tox.yaml4
-rw-r--r--jjb/csit/csit-vpp-device.yaml32
-rw-r--r--jjb/csit/csit.yaml13
4 files changed, 37 insertions, 37 deletions
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index d4f7b658e..dcce3879d 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -45,6 +45,19 @@
- 3n-dnv
- 3n-tsh:
executor: 'ubuntu1804arm-us'
+ stream:
+ - master:
+ branch: 'master'
+ branch-id: 'oper'
+ - '1908_1':
+ branch: 'rls1908_1'
+ branch-id: 'oper-rls1908_1'
+ - '1908_2':
+ branch: 'rls1908_2'
+ branch-id: 'oper-rls1908_2'
+ - '2001':
+ branch: 'rls2001'
+ branch-id: 'oper-rls2001'
- 'csit-vpp-perf-mrr-daily-master{node-arch}':
node-arch:
- '':
@@ -71,9 +84,9 @@
- master:
branch: 'master'
branch-id: 'oper'
- - '1908':
- branch: 'rls1908'
- branch-id: 'oper-rls1908'
+ - '1908_2':
+ branch: 'rls1908_2'
+ branch-id: 'oper-rls1908_2'
periodicity: '0 0 * * 6'
- 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}':
node-arch:
@@ -93,9 +106,9 @@
- master:
branch: 'master'
branch-id: 'oper'
- - '1908_1':
- branch: 'rls1908_1'
- branch-id: 'oper-rls1908_1'
+ - '1908_2':
+ branch: 'rls1908_2'
+ branch-id: 'oper-rls1908_2'
- '2001':
branch: 'rls2001'
branch-id: 'oper-rls2001'
diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index 3f405e40b..8990fa020 100644
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -23,8 +23,8 @@
stream:
- master:
branch: 'master'
- - '1908_1':
- branch: 'rls1908_1'
+ - '1908_2':
+ branch: 'rls1908_2'
- '2001':
branch: 'rls2001'
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 5ac2cbd5b..a34c1702e 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -26,27 +26,21 @@
jobs:
- 'csit-vpp-device-{stream}-{os}-{node-arch}'
- 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly':
- stream:
- - master:
+ stream:
+ - master:
branch: 'master'
branch-id: 'oper'
- - '1908':
- branch: 'rls1908_1'
- branch-id: 'oper-rls1908_1'
- - '2001':
- branch: 'rls2001'
- branch-id: 'oper-rls2001'
+ - '1908_2':
+ branch: 'rls1908_2'
+ branch-id: 'oper-rls1908_2'
- 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly':
- stream:
- - master:
+ stream:
+ - master:
branch: 'master'
branch-id: 'oper'
- - '1908':
- branch: 'rls1908_1'
- branch-id: 'oper-rls1908_1'
- - '2001':
- branch: 'rls2001'
- branch-id: 'oper-rls2001'
+ - '1908_2':
+ branch: 'rls1908_2'
+ branch-id: 'oper-rls1908_2'
- 'csit-vpp-device-master-{os}-1n-tx2-csit-verify-hourly'
- 'csit-vpp-device-master-{os}-1n-tx2-vpp-verify-hourly'
@@ -59,9 +53,9 @@
- master:
branch: 'master'
branch-id: 'oper'
- - '1908':
- branch: 'rls1908_1'
- branch-id: 'oper-rls1908_1'
+ - '1908_2':
+ branch: 'rls1908_2'
+ branch-id: 'oper-rls1908_2'
- '2001':
branch: 'rls2001'
branch-id: 'oper-rls2001'
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 2c75b308d..19262f745 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -17,12 +17,7 @@
description: 'CSIT Jenkins jobs.'
jobs:
- - 'csit-docs-merge-{stream}':
- stream:
- - master:
- branch: 'master'
- - '2001':
- branch: 'rls2001'
+ - 'csit-docs-merge-{stream}'
- 'csit-report-merge-{stream}'
- 'csit-trending-daily-master'
@@ -34,10 +29,8 @@
stream:
- master:
branch: 'master'
- - '1908':
- branch: 'rls1908'
- - '1908_1':
- branch: 'rls1908_1'
+ - '1908_2':
+ branch: 'rls1908_2'
- '2001':
branch: 'rls2001'