X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fl2switch%2Fl2switch.yaml;h=32a4ec7f89164144cdc26f0237c8a9ce7447662c;hb=88381e42f55aea865e5f4cf22d1a15d85aa75caa;hp=91ce168538a2a9e0b91bc163b3e89322e6c2098b;hpb=6296d9910277f5fcc25862cb417e1d8c2fedeff8;p=releng%2Fbuilder.git

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 91ce16853..32a4ec7f8 100644
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,106 +1,86 @@
 ---
 - project:
-    name: l2switch-magnesium
+    name: l2switch-silicon
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: magnesium
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'master'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    stream: silicon
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "master"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -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]'
+      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-sodium
+    name: l2switch-magnesium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/sodium'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    stream: magnesium
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "stable/magnesium"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -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]'
+      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-neon
+    name: l2switch-release-management
     jobs:
-      - odl-maven-jobs
+      - gerrit-release-merge
 
-    stream: neon
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/neon'
-    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
+    project: l2switch
+    project-name: l2switch
 
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
+    build-node: centos7-builder-2c-1g
+    mvn-settings: l2switch-settings
 
 - project:
-    name: l2switch-fluorine
+    name: l2switch-sonar
     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]'
+      - gerrit-maven-sonar
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "master"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"
     disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
+    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-sonar
+    name: l2switch-info
     jobs:
-      - gerrit-maven-sonar
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'master'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    disable-job: true
+      - gerrit-info-yaml-verify
+    project: l2switch
+    project-name: l2switch
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: l2switch-view