X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fl2switch%2Fl2switch.yaml;h=24c8ef7f676567787772022efe73acd8fc456a56;hb=1cce0fb562d324431ae3ce6f82cebc5ca4a01289;hp=30f1487e2779165c04256b2e961e8fce2d3194d5;hpb=9bb93ee7591e9aa4c5c653ce123437fbbe256b68;p=releng%2Fbuilder.git

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 30f1487e2..24c8ef7f6 100644
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,15 +1,17 @@
 ---
 - project:
-    name: l2switch-sodium
+    name: l2switch-aluminium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: aluminium
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
     mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -23,16 +25,17 @@
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-neon
+    name: l2switch-magnesium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: magnesium
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/neon'
+    branch: 'stable/magnesium'
     mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -46,40 +49,17 @@
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/fluorine'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
-
-- project:
-    name: l2switch-oxygen
+    name: l2switch-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: sodium
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/oxygen'
+    branch: 'stable/sodium'
     mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -100,8 +80,12 @@
     project-name: 'l2switch'
     branch: 'master'
     mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: l2switch-view