X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fl2switch%2Fl2switch.yaml;h=36eb6bc77167dd40e891b6022ec7372825d55a3d;hb=dac658c4a6587a4b299b18df0e2c558371722167;hp=b5182eb0fe14b789fa27bdc9c8923b0ef51df375;hpb=084d3d05ae1613e7449813ab1af59a2a9886fb0d;p=releng%2Fbuilder.git

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index b5182eb0f..36eb6bc77 100644
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,25 +1,21 @@
 ---
 - project:
-    name: l2switch-nitrogen
+    name: l2switch-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
@@ -30,28 +26,26 @@
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fee85953ca0
+
 - project:
-    name: l2switch-carbon
+    name: l2switch-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
@@ -62,29 +56,27 @@
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fee85953ca0
+
 - project:
-    name: l2switch-boron
+    name: l2switch-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: carbon
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
@@ -95,13 +87,15 @@
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fee85953ca0
+
 - project:
     name: l2switch-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
     mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'