Chore: Upgrade jobs to use JDK17 for Sonar

[releng/builder.git] / jjb / unimgr / unimgr.yaml

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index c762c7aa6487d70ee8d626be1629bf8f77005cc6..161a978059e61a19acd6f0340aa2143c7f9f8698 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,16 +1,16 @@
 ---
 - project:
-    name: unimgr-phosphorus
+    name: unimgr-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-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-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: master
     project: "unimgr"
     project-name: "unimgr"
     branch: "master"
@@ -28,64 +28,6 @@
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
-- project:
-    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
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "unimgr"
-    project-name: "unimgr"
-    branch: "stable/silicon"
-    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-aluminium
-    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: aluminium
-    project: "unimgr"
-    project-name: "unimgr"
-    branch: "stable/aluminium"
-    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-release-management
     jobs:
@@ -100,18 +42,13 @@
 - project:
     name: unimgr-sonar
     jobs:
-      - gerrit-maven-sonar
+      - odl-sonar-jobs-jdk17
 
     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