X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Funimgr%2Funimgr.yaml;h=9133b8cfcbbc553ff93ac3ca3c8d9765530ad7f5;hb=5102e39ad035be2409ce11d59605921a58646308;hp=5ff0630b2947739a512ac5094f25835296a104b3;hpb=9319e02772bba40e23bca708918c482503fe9ae1;p=releng%2Fbuilder.git

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 5ff0630b2..9133b8cfc 100644
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,31 +1,35 @@
 ---
 - project:
-    name: unimgr-aluminium
+    name: unimgr-silicon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: unimgr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/
           rtd-token: e12225e9b9ac67f5439c1619dcad342393b7ea31
-      - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        mdsal-merge-{stream}
+    email-upstream: '[unimgr] [odlparent] [yangtools] [controller] [mdsal]'
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-magnesium
+    name: unimgr-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -35,21 +39,26 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/magnesium'
+    branch: 'stable/aluminium'
+    java-version: 'openjdk11'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        mdsal-merge-{stream}
+    email-upstream: '[unimgr] [odlparent] [yangtools] [controller] [mdsal]'
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-sodium
+    name: unimgr-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -59,10 +68,11 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
+    java-version: 'openjdk11'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'ovsdb-merge-{stream}'
@@ -73,7 +83,7 @@
     staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-neon
+    name: unimgr-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -83,10 +93,10 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'ovsdb-merge-{stream}'
@@ -96,6 +106,17 @@
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
+- project:
+    name: unimgr-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: unimgr
+    project-name: unimgr
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: unimgr-settings
+
 - project:
     name: unimgr-sonar
     jobs:
@@ -104,8 +125,22 @@
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
+- project:
+    name: unimgr-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: unimgr
+    project-name: unimgr
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: unimgr-view