Merge "Update multipatch script"

[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 3628b71206439a5fe5adf1e807789c2f426137a5..4449ca659220163a86c7a88ca180fc76a654f71d 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -1,26 +1,28 @@
+---
 - project:
     name: l2switch-patch-test
     jobs:
-        - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'l2switch'
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jdk: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+      - sodium:
+          branch: 'master'
+          os-branch: 'queens'
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
+          disable-job: true
 
     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}
+      - all:
+          csit-list: >
+              l2switch-csit-1node--host-scalability-daily-only-{stream},
+              l2switch-csit-1node-scalability-all-{stream},
+              l2switch-csit-1node-switch-all-{stream}