Merge "Remove of-config carbon jobs"

[releng/builder.git] / jjb / l2switch / l2switch.yaml

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 2648d5062843b409ff7679abe5eee90568031f84..c55bb6ced91892e54a1b4f2906b885f60ce66b77 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,12 +1,10 @@
 ---
 - project:
-    name: l2switch-oxygen
+    name: l2switch-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
@@ -24,16 +22,15 @@
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-nitrogen
+    name: l2switch-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
@@ -48,17 +45,15 @@
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-carbon
+    name: l2switch-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/nitrogen'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >