Merge "Auto Update CSIT Jobs to run for silicon"

[releng/builder.git] / jjb / l2switch / l2switch-patch-test.yaml

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index ed3621fdeeebb7b7dd065384c56bba2bc53f2e54..83e39600fa93bf1d1f513b54c55eb4939a800c27 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -2,31 +2,29 @@
 - project:
     name: l2switch-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
-    project: 'l2switch'
+    project: "l2switch"
+    disable-job: true
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
-          jdk: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
-          karaf-version: karaf3
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
+
+    os-branch: "queens"
 
     feature:
       - all:
           csit-list: >
-              l2switch-csit-1node-periodic-host-scalability-daily-only-{stream},
-              l2switch-csit-1node-scalability-only-{stream},
-              l2switch-csit-1node-switch-only-{stream}
+            l2switch-csit-1node--host-scalability-daily-only-{stream},
+            l2switch-csit-1node-scalability-all-{stream},
+            l2switch-csit-1node-switch-all-{stream}