X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fserviceutils%2Fserviceutils.yaml;h=d6e4f142bf6badfb6c1eaede8b874e4964d6528f;hb=1309a144c140e56537d53ae0332535b9a640de60;hp=9a9656900b6c0d2aaf6897584393ba9a1c2be92e;hpb=6e91002348da2f050c93c2aa7d307254b5748403;p=releng%2Fbuilder.git

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 9a9656900..d6e4f142b 100644
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,59 +1,25 @@
 ---
 - project:
-    name: serviceutils-phosphorus
+    name: serviceutils-potassium
     jobs:
       - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     branch: "master"
-    stream: phosphorus
+    stream: potassium
 
     project: "serviceutils"
     project-name: "serviceutils"
-    build-node: centos7-builder-2c-2g
-    java-version: "openjdk11"
+    build-node: centos8-builder-2c-2g
     mvn-settings: "serviceutils-settings"
-    mvn-opts: "-Xmx1024m"
-    build-timeout: 90
-    dependencies: >
-      controller-merge-{stream},
-      yangtools-merge-{stream},
-      odlparent-merge-{stream},
-      infrautils-merge-{stream}
-    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
-
-    # Used by the release job
-    staging-profile-id: 12cc4ba8bf01ba
-
-- project:
-    name: serviceutils-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: serviceutils
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
-          rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    branch: "stable/silicon"
-    stream: silicon
-
-    project: "serviceutils"
-    project-name: "serviceutils"
-    build-node: centos7-builder-2c-2g
-    java-version: "openjdk11"
-    mvn-settings: "serviceutils-settings"
-    mvn-opts: "-Xmx1024m"
     build-timeout: 90
     dependencies: >
       controller-merge-{stream},
@@ -61,32 +27,30 @@
       odlparent-merge-{stream},
       infrautils-merge-{stream}
     email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
-
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-aluminium
+    name: serviceutils-argon
     jobs:
       - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    branch: "stable/aluminium"
-    stream: aluminium
+    branch: "stable/argon"
+    stream: argon
 
     project: "serviceutils"
     project-name: "serviceutils"
-    build-node: centos7-builder-2c-2g
-    java-version: "openjdk11"
+    build-node: centos8-builder-2c-2g
     mvn-settings: "serviceutils-settings"
-    mvn-opts: "-Xmx1024m"
     build-timeout: 90
     dependencies: >
       controller-merge-{stream},
@@ -94,32 +58,30 @@
       odlparent-merge-{stream},
       infrautils-merge-{stream}
     email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
-
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-magnesium
+    name: serviceutils-chlorine
     jobs:
       - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    branch: "stable/magnesium"
-    stream: magnesium
+    branch: "stable/chlorine"
+    stream: chlorine
 
     project: "serviceutils"
     project-name: "serviceutils"
-    build-node: centos7-builder-2c-2g
-    java-version: "openjdk11"
+    build-node: centos8-builder-2c-2g
     mvn-settings: "serviceutils-settings"
-    mvn-opts: "-Xmx1024m"
     build-timeout: 90
     dependencies: >
       controller-merge-{stream},
@@ -127,7 +89,6 @@
       odlparent-merge-{stream},
       infrautils-merge-{stream}
     email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
-
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
@@ -139,8 +100,7 @@
     project: "serviceutils"
     project-name: "serviceutils"
     branch: "master"
-    build-node: centos7-builder-4c-4g
-    java-version: "openjdk11"
+    mvn-version: mvn38
     mvn-settings: "serviceutils-settings"
     mvn-opts: "-Xmx1024m"
     sonarcloud: true