X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Finfrautils%2Finfrautils.yaml;h=d9210e2642c4c24b909f6fe7850fcbe478080b3c;hb=067ae787d01909541fccd31231f6d46db65fb387;hp=553a073ead9730a209d2c00d5e6af4c74236c13b;hpb=bbe9de2506c6c0ab705b4b2926ef8824e5eba24e;p=releng%2Fbuilder.git

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 553a073ea..d9210e264 100644
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,99 +1,116 @@
 ---
 - project:
-    name: infrautils-aluminium
+    name: infrautils-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-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
 
-    stream: aluminium
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'infrautils-settings'
-    mvn-version: mvn36
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
+    stream: master
+    project: "infrautils"
+    project-name: "infrautils"
+    branch: "master"
+    java-version: "openjdk17"
+    mvn-settings: "infrautils-settings"
+    build-node: centos8-builder-4c-4g
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[infrautils] [odlparent]"
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-magnesium
+    name: infrautils-4.0.x
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-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
 
-    stream: magnesium
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
+    stream: 4.0.x
+    project: "infrautils"
+    project-name: "infrautils"
+    branch: "4.0.x"
+    java-version: "openjdk17"
+    mvn-settings: "infrautils-settings"
+    build-node: centos8-builder-4c-4g
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[infrautils] [odlparent]"
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
 - project:
-    name: infrautils-sodium
+    name: infrautils-3.0.x
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-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
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17:
+          build-node: centos8-builder-4c-4g
 
-    stream: sodium
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/sodium'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
+    stream: 3.0.x
+    project: "infrautils"
+    project-name: "infrautils"
+    branch: 3.0.x
+    java-version: "openjdk11"
+    mvn-settings: "infrautils-settings"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[infrautils] [odlparent]"
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
+- project:
+    name: infrautils-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: infrautils
+    project-name: infrautils
+
+    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
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m'
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
+
+    project: "infrautils"
+    project-name: "infrautils"
+    branch: "master"
+    java-version: "openjdk17"
+    mvn-version: mvn38
+    mvn-settings: "infrautils-settings"
+    build-node: centos8-builder-4c-4g
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: infrautils-info