CSIT: Cleanup jobs

- rls1904
- func/dmm/tldk/hc/nsh
+ perf LTS
+ vpp_device LTS

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ib88c93e76958d2f79db08eea5a639c264e6c492c

1 files changed, 28 insertions, 28 deletions

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 9fb768a5d..5ac2cbd5b 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -25,46 +25,46 @@
           trigger: 'gerrit-trigger-csit-vpp-devicetest-manual'
     jobs:
       - 'csit-vpp-device-{stream}-{os}-{node-arch}'
-      - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly'
-      - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly'
-      - 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly'
-      - 'csit-vpp-device-master-ubuntu1804-1n-tx2-vpp-verify-hourly'
+      - 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly':
+           stream:
+             - master:
+                branch: 'master'
+                branch-id: 'oper'
+             - '1908':
+                branch: 'rls1908_1'
+                branch-id: 'oper-rls1908_1'
+             - '2001':
+                branch: 'rls2001'
+                branch-id: 'oper-rls2001'
+      - 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly':
+           stream:
+             - master:
+                branch: 'master'
+                branch-id: 'oper'
+             - '1908':
+                branch: 'rls1908_1'
+                branch-id: 'oper-rls1908_1'
+             - '2001':
+                branch: 'rls2001'
+                branch-id: 'oper-rls2001'
+      - 'csit-vpp-device-master-{os}-1n-tx2-csit-verify-hourly'
+      - 'csit-vpp-device-master-{os}-1n-tx2-vpp-verify-hourly'
 
     project: 'csit'
     executor: 'vpp-csit-device'
     branch: 'master'
     branch-id: 'oper'
     trigger: 'gerrit-trigger-csit-vpp-devicetest-full'
-    stream_timed:
-      - master:
-          branch: 'master'
-          branch-id: 'oper'
-      - '2001':
-          branch: 'rls2001'
-          branch-id: 'oper-rls2001'
     stream:
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1904':
-          branch: 'rls1904'
-          branch-id: 'oper-rls1904'
       - '1908':
           branch: 'rls1908_1'
           branch-id: 'oper-rls1908_1'
       - '2001':
           branch: 'rls2001'
           branch-id: 'oper-rls2001'
-    exclude:
-      - stream: '1904'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
-      - stream_timed: '1908'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
-      - stream_timed: 'master'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
 
 - job-template:
     name: 'csit-vpp-device-{stream}-{os}-{node-arch}'
@@ -164,7 +164,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly'
+    name: 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly'
     description: |
       <ul>
           <li>objective
@@ -248,7 +248,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly'
+    name: 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly'
     description: |
       <ul>
           <li>objective
@@ -333,7 +333,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly'
+    name: 'csit-vpp-device-master-{os}-1n-tx2-csit-verify-hourly'
     description: |
       <ul>
           <li>objective
@@ -413,7 +413,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-vpp-verify-hourly'
+    name: 'csit-vpp-device-master-{os}-1n-tx2-vpp-verify-hourly'
     description: |
       <ul>
           <li>objective