X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fl2switch%2Fl2switch.yaml;h=864ac48ddcbd7197d17a4d873989eac3837a2725;hb=5102e39ad035be2409ce11d59605921a58646308;hp=347e3f23a121d0e30b071dfe6c6b7272c8b8f4b7;hpb=79c0ee538aea4c11720752b23f5416a344f30d2e;p=releng%2Fbuilder.git

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 347e3f23a..864ac48dd 100644
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,15 +1,16 @@
 ---
 - project:
-    name: l2switch-sodium
+    name: l2switch-silicon
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: silicon
     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},
@@ -17,21 +18,23 @@
         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-neon
+    name: l2switch-aluminium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: aluminium
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/neon'
+    branch: 'stable/aluminium'
     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},
@@ -39,21 +42,23 @@
         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-fluorine
+    name: l2switch-magnesium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: magnesium
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/fluorine'
+    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},
@@ -61,22 +66,23 @@
         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},
@@ -89,6 +95,17 @@
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
+- project:
+    name: l2switch-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: l2switch
+    project-name: l2switch
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: l2switch-settings
+
 - project:
     name: l2switch-sonar
     jobs:
@@ -97,7 +114,21 @@
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: l2switch
+    project-name: l2switch
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: l2switch-view