X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=7c3b930997d7755069fd8ee53a4693b51730e14a;hb=e3df9661c6a556bfaab9e3bda8552c326326d844;hp=bd6f2fef58cd9f70ca9d9736208f8096fb2b1059;hpb=e6f4ec701916778b029c1539f3ec7c86a684ab67;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index bd6f2fef5..7c3b93099 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -12,40 +12,40 @@
 
       - gerrit-maven-stage:
           sign-artifacts: true
-          cron: ''
+          sbom-generator: true
+          cron: ""
+
+      - gerrit-maven-mri-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          cron: ""
 
     java-version: openjdk11
-    mvn-version: mvn35
+    mvn-version: mvn38
 
 - job-group:
-    name: odl-maven-jobs
+    name: odl-maven-jobs-jdk17
 
     jobs:
       - gerrit-maven-clm:
           nexus-iq-namespace: odl-
           nexus-iq-stage: release
 
-      # TODO: Figure out what's wrong with the gerrit-maven-merge job.
-      # - gerrit-maven-merge:
-      #     post_build_trigger:
-      #       - project:
-      #           - 'distribution-merge-{stream}'
-      #         condition: SUCCESS
-      #         trigger-with-no-params: true
-      - '{project-name}-merge-{stream}':
+      - gerrit-maven-merge:
           build-timeout: 180
-          mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
-          disable-job: '{disable-job}'
 
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-          mvn-central: false
-          ossrh-profile-id: 6386ebbbf3a563
-          cron: ''
+          cron: ""
 
-    java-version: openjdk8
-    mvn-version: mvn35
-    disable-job: '{disable-job}'
+      - gerrit-maven-mri-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          cron: ""
+
+    java-version: openjdk17
+    mvn-version: mvn38
 
 - job-group:
     name: odl-maven-verify-jobs
@@ -55,10 +55,21 @@
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
 
-    mvn-version: mvn35
+    mvn-version: mvn38
+
+- job-group:
+    name: odl-maven-verify-jobs-jdk17
+
+    jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies:
+          build-timeout: 180
+
+    mvn-version: mvn38
+    java-version: openjdk17
 
 - job-template:
-    name: '{project-name}-integration-{stream}'
+    name: "{project-name}-integration-{stream}"
 
     ######################
     # Default parameters #
@@ -78,68 +89,68 @@
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
-    jdk: '{java-version}'
-    disabled: '{disable-job}'
+    node: "{build-node}"
+    jdk: "{java-version}"
+    disabled: "{disable-job}"
 
     properties:
       - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
 
     scm:
       - git-scm:
-          refspec: ''
-          branch: '{branch}'
+          refspec: ""
+          branch: "{branch}"
 
     wrappers:
       - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - reverse:
-          jobs: '{dependencies}'
-          result: 'success'
+          jobs: "{dependencies}"
+          result: "success"
 
     builders:
       - lf-jacoco-nojava-workaround
       - lf-provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       - maven-target:
-          maven-version: 'mvn35'
+          maven-version: "mvn35"
           goals: |
-              {mvn-goals}
-              {opendaylight-infra-mvn-opts}
+            {mvn-goals}
+            {opendaylight-infra-mvn-opts}
           java-opts:
-            - '{mvn-opts}'
-          settings: '{mvn-settings}'
+            - "{mvn-opts}"
+          settings: "{mvn-settings}"
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: "global-settings"
           global-settings-type: cfp
 
     publishers:
       - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '{email-upstream}'
+          email-recipients: "{email-recipients}"
+          email-prefix: "{email-upstream}"
       - findbugs
       - lf-jacoco-report
       - lf-infra-publish
 
 - job-template:
-    name: '{project-name}-merge-{stream}'
+    name: "{project-name}-merge-{stream}"
 
     ######################
     # Default parameters #
     ######################
-    disable-job: 'false'
+    disable-job: "false"
 
     archive-artifacts: >
       **/*.log
@@ -147,8 +158,8 @@
       **/target/**/feature.xml
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
-    cron: '@daily'
-    mvn-opts: ''
+    cron: "@daily"
+    mvn-opts: ""
     mvn-version: mvn35
     java-version: openjdk8
 
@@ -161,9 +172,9 @@
     # separate lifecycle:
     #     https://issues.apache.org/jira/browse/MNG-5666
     project-type: maven
-    node: '{build-node}'
-    jdk: '{java-version}'
-    disabled: '{disable-job}'
+    node: "{build-node}"
+    jdk: "{java-version}"
+    disabled: "{disable-job}"
 
     properties:
       - opendaylight-infra-properties:
@@ -171,54 +182,54 @@
 
     parameters:
       - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - string:
           name: STREAM
-          default: '{stream}'
+          default: "{stream}"
           description: "String representing release name"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
+          refspec: ""
+          choosing-strategy: "default"
 
     wrappers:
       - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
-      - timed: '{obj:cron}'
+      - timed: "{obj:cron}"
       - gerrit-trigger-patch-merged:
-          gerrit-server-name: '{gerrit-server-name}'
-          name: '{project}'
-          branch: '{branch}'
-          files: '**'
-          forbidden-files: ''
+          gerrit-server-name: "{gerrit-server-name}"
+          name: "{project}"
+          branch: "{branch}"
+          files: "**"
+          forbidden-files: ""
 
     prebuilders:
       - lf-jacoco-nojava-workaround
       - lf-provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       - lf-maven-install:
-          mvn-version: '{mvn-version}'
+          mvn-version: "{mvn-version}"
 
     # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
     maven:
-      maven-name: '{mvn-version}'
+      maven-name: "{mvn-version}"
       goals: >
-          {mvn-goals}
-          -Dmerge
-          -Dstream={stream}
-          {opendaylight-infra-mvn-opts}
-      maven-opts: '{mvn-opts}'
-      settings: '{mvn-settings}'
+        {mvn-goals}
+        -Dmerge
+        -Dstream={stream}
+        {opendaylight-infra-mvn-opts}
+      maven-opts: "{mvn-opts}"
+      settings: "{mvn-settings}"
       settings-type: cfp
-      global-settings: 'global-settings'
+      global-settings: "global-settings"
       global-settings-type: cfp
       post-step-run-condition: UNSTABLE
 
@@ -227,10 +238,10 @@
 
     publishers:
       - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project-name}]"
       - maven-deploy:
-          id: ''
+          id: ""
           unique-version: true
           deploy-unstable: false
       - lf-jacoco-report