X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Finfrautils%2Finfrautils.yaml;h=1bcd5dc8ac41a64c5d6556ddbd30191c38c3ddd2;hb=149ac00f7b8589d3e6f5ddbbe1f3d5d42c8c8a87;hp=fcca916fb6e9bfe23be3876b6329068033623803;hpb=ae75c9ba0cf3f4b398dccb1de5c03d98cb2291cc;p=releng%2Fbuilder.git

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index fcca916fb..1bcd5dc8a 100644
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -3,20 +3,22 @@
     name: infrautils-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: ubuntu2004-docker-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: infrautils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21
 
+    project: infrautils
+    project-name: infrautils
     stream: master
-    project: "infrautils"
-    project-name: "infrautils"
-    branch: "master"
-    java-version: "openjdk11"
+    branch: master
+    build-node: ubuntu2004-docker-2c-2g
+
     mvn-settings: "infrautils-settings"
+
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -24,24 +26,26 @@
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-1.8.x
+    name: infrautils-6.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: ubuntu2004-docker-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: infrautils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+      - odl-maven-verify-jobs-jdk21
+
+    project: infrautils
+    project-name: infrautils
+    stream: 6.0.x
+    branch: 6.0.x
+    build-node: ubuntu2004-docker-2c-2g
 
-    stream: aluminium
-    project: "infrautils"
-    project-name: "infrautils"
-    branch: "1.8.x"
-    java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
+
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -58,11 +62,14 @@
 
     build-node: centos7-builder-2c-1g
     mvn-settings: infrautils-settings
+    # Needs to be rather long until we sort out the performance of
+    # https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/
+    build-timeout: 60
 
 - project:
     name: infrautils-sonar
     jobs:
-      - gerrit-maven-sonar:
+      - odl-sonar-jobs-jdk21:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
@@ -73,13 +80,7 @@
     project: "infrautils"
     project-name: "infrautils"
     branch: "master"
-    java-version: "openjdk11"
     mvn-settings: "infrautils-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: infrautils-info