Merge "Remove neutron carbon jobs"

[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 24dfe9c7a2337b82af77beaf1fe3994e74c04420..b3a3a205d0ab23ac484970284c847b214a67e429 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -2,29 +2,23 @@
 - project:
     name: l2switch-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'l2switch'
 
     # Project branches
     stream:
-      - nitrogen:
+      - fluorine:
           branch: 'master'
-          jdk: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jdk: 'openjdk7'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
 
     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}