Fix: Ubuntu Devstack node needs larger instance type

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

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 7c3b930997d7755069fd8ee53a4693b51730e14a..7ff223a01b577bfa1e6b3f1ff6b01c9a16d2c8a7 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -1,28 +1,4 @@
 ---
-- job-group:
-    name: odl-maven-jobs-jdk11
-
-    jobs:
-      - gerrit-maven-clm:
-          nexus-iq-namespace: odl-
-          nexus-iq-stage: release
-
-      - gerrit-maven-merge:
-          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: mvn38
-
 - job-group:
     name: odl-maven-jobs-jdk17
 
@@ -30,6 +6,7 @@
       - gerrit-maven-clm:
           nexus-iq-namespace: odl-
           nexus-iq-stage: release
+          mvn-opts: "--add-opens java.base/java.util=ALL-UNNAMED"
 
       - gerrit-maven-merge:
           build-timeout: 180
@@ -48,25 +25,29 @@
     mvn-version: mvn38
 
 - job-group:
-    name: odl-maven-verify-jobs
+    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-maven-verify-jobs-jdk17
+    name: odl-sonar-jobs-jdk17
 
     jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-verify-dependencies:
-          build-timeout: 180
+      - gerrit-maven-sonar
 
-    mvn-version: mvn38
     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}"
@@ -158,10 +139,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 #