From d158be56351fbcbbc6d086c8984bbf8e900099d5 Mon Sep 17 00:00:00 2001
From: Jan Gelety <jgelety@cisco.com>
Date: Wed, 7 Aug 2019 00:05:24 +0200
Subject: [PATCH] Add CSIT rls1908 branch

Change-Id: Idce71e83e7bfa5a1430dce4f1266d172ddfdabf7
Signed-off-by: Jan Gelety <jgelety@cisco.com>
---
 jjb/csit/csit-func.yaml       | 12 +++++-------
 jjb/csit/csit-hc2vpp.yaml     |  6 +++---
 jjb/csit/csit-perf.yaml       | 12 ++++--------
 jjb/csit/csit-tox.yaml        |  2 ++
 jjb/csit/csit-vpp-device.yaml | 18 ++++++------------
 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
-- 
2.16.6