Remove netconf-4.0.x jobs

[releng/builder.git] / jjb / releng-templates-java.yaml

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index ac491283a2878dd5448bb408636276f5100fcf60..046b7ff747082c7d3d1f3cb8fc56f4079998d4e7 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -11,41 +11,42 @@
           build-timeout: 180
 
       - gerrit-maven-stage:
+          sign-artifacts: true
+          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
+          mvn-opts: "--add-opens java.base/java.util=ALL-UNNAMED"
 
-      # 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: ""
 
-    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,7 +56,32 @@
       - 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
+
+    java-version: openjdk17
+    mvn-version: mvn38
+
+- job-group:
+    name: odl-sonar-jobs-jdk17
+
+    jobs:
+      - gerrit-maven-sonar
+
+    java-version: openjdk17
+    mvn-version: mvn38
+    sonarcloud: true
+    sonarcloud-java-version: openjdk17
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - job-template:
     name: "{project-name}-integration-{stream}"
@@ -72,6 +98,10 @@
       **/target/surefire-reports/*-output.txt
     mvn-goals: clean install
     disable-job: false
+    jacoco-exclude-pattern: "**/gen/**,\
+      **/generated-sources/**,\
+      **/yang-gen**,\
+      **/pax/**"
 
     #####################
     # Job Configuration #
@@ -130,7 +160,8 @@
           email-recipients: "{email-recipients}"
           email-prefix: "{email-upstream}"
       - findbugs
-      - lf-jacoco-report
+      - lf-jacoco-report:
+          exclude-pattern: "{jacoco-exclude-pattern}"
       - lf-infra-publish
 
 - job-template:
@@ -140,6 +171,10 @@
     # Default parameters #
     ######################
     disable-job: "false"
+    jacoco-exclude-pattern: "**/gen/**,\
+      **/generated-sources/**,\
+      **/yang-gen**,\
+      **/pax/**"
 
     archive-artifacts: >
       **/*.log
@@ -147,10 +182,9 @@
       **/target/**/feature.xml
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
-    cron: "@daily"
+    cron: "0 0 * * tue,sat"
     mvn-opts: ""
     mvn-version: mvn35
-    java-version: openjdk8
 
     #####################
     # Job Configuration #
@@ -233,5 +267,6 @@
           id: ""
           unique-version: true
           deploy-unstable: false
-      - lf-jacoco-report
+      - lf-jacoco-report:
+          exclude-pattern: "{jacoco-exclude-pattern}"
       - lf-infra-publish