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 7deffdf4cf15f71059b58c5b9b616091f9ffcc46..83e39600fa93bf1d1f513b54c55eb4939a800c27 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -1,26 +1,30 @@
+---
 - 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:
-        - carbon:
-            branch: 'master'
-            jdk: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jdk: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+      - 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-{stream},
-                l2switch-csit-1node-scalability-only-{stream},
-                l2switch-csit-1node-switch-only-{stream}
+      - all:
+          csit-list: >
+            l2switch-csit-1node--host-scalability-daily-only-{stream},
+            l2switch-csit-1node-scalability-all-{stream},
+            l2switch-csit-1node-switch-all-{stream}