X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Funimgr%2Funimgr.yaml;h=8ccf211b2aed464870246ed399feffaed2df110b;hb=36be72ec0c12d5276cd35e7879fa5a963bdca30a;hp=04e5ea08ae0320d614f6f0a971304b6c3a994c7c;hpb=ce95944aa16fbf7151b6c8664aa72f11d46902f0;p=releng%2Fbuilder.git

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 04e5ea08a..8ccf211b2 100644
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,94 +1,59 @@
 ---
 - project:
-    name: unimgr-aluminium
+    name: unimgr-master
     jobs:
-      - '{project-name}-rtd-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-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m'
+    stream: master
+    project: "unimgr"
+    project-name: "unimgr"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "unimgr-settings"
+    mvn-opts: "-Xmx1024m"
     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
-    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
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
+      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-release-management
     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
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - gerrit-release-merge
 
-    stream: sodium
-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/sodium'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
-    build-node: centos7-builder-4c-16g
+    project: unimgr
+    project-name: unimgr
 
-    # Used by the release job
-    staging-profile-id: a695d0a0b8d51
+    build-node: centos7-builder-2c-1g
+    mvn-settings: unimgr-settings
 
 - project:
     name: unimgr-sonar
     jobs:
       - gerrit-maven-sonar
 
-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m'
+    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