Chore: Upgrade global-jjb to v0.90.8

[ci-management.git] / jjb / policy / policy-common.yaml

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index d01bb1d..d4cde4e 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -14,47 +14,18 @@
       - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: "policy/common"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    mvn-settings: "policy-common-settings"
-    java-version: openjdk17
-    files: "**"
-    archive-artifacts: ""
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: policy-common-java11
-    project-name: "policy-common"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java"
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-versions-plugin: true
-          mvn-params: "-Dmaven.test.skip=true"
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-
     project: "policy/common"
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
-      - "london":
-          branch: "london"
+      - "montreal":
+          branch: "montreal"
+      - "newdelhi":
+          branch: "newdelhi"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-common-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     files: "**"
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
@@ -67,15 +38,15 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
     project: "policy/common"
     project-name: "policy-common"
     branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-common-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-common-clm
@@ -87,5 +58,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-common-settings"
-    java-version: openjdk11
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    java-version: openjdk17