[POLICY] Update branches supported after Quebec release

Issue-ID: POLICY-5491
Change-Id: I32a78d7697fadd4b2c2a4da1182c0d5a36c1ff6b
Signed-off-by: waynedunican <wayne.dunican@est.tech>
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index b70f653..a589bb7 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -32,12 +32,10 @@
 
     project: "policy/apex-pdp"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-apex-pdp-settings"
@@ -46,56 +44,90 @@
     archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
+- project:
+    name: policy-apex-pdp-java-21
+    project-name: "policy-apex-pdp"
+    project: "policy/apex-pdp"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          maven-versions-plugin: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+
 - project:
     name: policy-apex-pdp-sonar
+    project: "policy/apex-pdp"
+    project-name: "policy-apex-pdp"
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
-    project: "policy/apex-pdp"
-    project-name: "policy-apex-pdp"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-apex-pdp-settings"
-    java-version: openjdk17
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
     cron: "@daily"
 
 - project:
     name: policy-apex-pdp-sonar-verify
+    project: "policy/apex-pdp"
+    project-name: "policy-apex-pdp"
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
-    project: "policy/apex-pdp"
-    project-name: "policy-apex-pdp"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-apex-pdp-settings"
-    java-version: openjdk17
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
     sonarcloud-qualitygate-wait: true
 
 - project:
     name: policy-apex-pdp-clm
+    project: policy/apex-pdp
+    project-name: "policy-apex-pdp"
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: "onap-"
-    project: policy/apex-pdp
-    project-name: "policy-apex-pdp"
     stream:
       - "master":
           branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-apex-pdp-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    java-version: openjdk17
+    java-version: openjdk21

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 2aa5126..cfb09d7 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -26,12 +26,10 @@
 
     project: "policy/api"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-api-settings"
@@ -40,56 +38,90 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-api-java-21
+    project-name: "policy-api"
+    project: "policy/api"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          maven-versions-plugin: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+
 - project:
     name: policy-api-sonar
+    project: "policy/api"
+    project-name: "policy-api"
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
-    project: "policy/api"
-    project-name: "policy-api"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-settings: "policy-api-settings"
-    java-version: openjdk17
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
     cron: "@daily"
 
 - project:
     name: policy-api-sonar-verify
+    project: "policy/api"
+    project-name: "policy-api"
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
-    project: "policy/api"
-    project-name: "policy-api"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-settings: "policy-api-settings"
-    java-version: openjdk17
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
     sonarcloud-qualitygate-wait: true
 
 - project:
     name: policy-api-clm
+    project: policy/api
+    project-name: "policy-api"
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: "onap-"
-    project: policy/api
-    project-name: "policy-api"
     stream:
       - "master":
           branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-api-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    java-version: openjdk17
+    java-version: openjdk21

diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index ef661bd..46343fb 100644 (file)
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -26,12 +26,10 @@
 
     project: "policy/clamp"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-clamp-settings"
@@ -40,57 +38,90 @@
     archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
+- project:
+    name: policy-clamp-java-21
+    project-name: "policy-clamp"
+    project: "policy/clamp"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          maven-versions-plugin: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+
 - project:
     name: policy-clamp-sonar
+    project: "policy/clamp"
+    project-name: "policy-clamp"
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-docker-8c-8g
-    project: "policy/clamp"
-    project-name: "policy-clamp"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-clamp-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
-    java-version: openjdk17
     cron: "@daily"
 
 - project:
     name: policy-clamp-sonar-verify
+    project: "policy/clamp"
+    project-name: "policy-clamp"
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-docker-8c-8g
-    project: "policy/clamp"
-    project-name: "policy-clamp"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-clamp-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
-    java-version: openjdk17
     sonarcloud-qualitygate-wait: true
 
 - project:
     name: policy-clamp-clm
+    project: policy/clamp
+    project-name: "policy-clamp"
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
     nexus-iq-namespace: "onap-"
-    project: "policy/clamp"
-    project-name: "policy-clamp"
     stream:
       - "master":
           branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-clamp-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    build-node: ubuntu1804-docker-8c-8g
-    java-version: openjdk17
+    java-version: openjdk21

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 83ae914..e409afa 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -16,12 +16,10 @@
 
     project: "policy/common"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-common-settings"
@@ -30,6 +28,33 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-common-java-21
+    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: ubuntu2204-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: ubuntu2204-docker-8c-8g
+
+    project: "policy/common"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "policy-common-settings"
+    java-version: openjdk21
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-docker-8c-8g
+
 - project:
     name: policy-common-sonar
     jobs:
@@ -38,14 +63,14 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu2204-docker-8c-8g
     project: "policy/common"
     project-name: "policy-common"
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-common-settings"
-    java-version: openjdk17
+    java-version: openjdk21
     mvn-goals: "clean install"
     cron: "@daily"
 
@@ -57,15 +82,15 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2204-docker-8c-8g
     project: "policy/common"
     project-name: "policy-common"
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-common-settings"
     mvn-goals: "clean install"
-    java-version: openjdk17
+    java-version: openjdk21
     sonarcloud-qualitygate-wait: true
 
 - project:
@@ -78,8 +103,8 @@
     stream:
       - "master":
           branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-common-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    java-version: openjdk17
+    java-version: openjdk21

diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
index 0a2a7a3..0806ccb 100644 (file)
--- a/jjb/policy/policy-csit-jobs.yaml
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -3,7 +3,7 @@
     name: "{project-name}-{stream}-project-csit-{functionality}"
     disabled: false
     project-type: freestyle
-    build-node: "ubuntu1804-docker-8c-8g"
+    build-node: "ubuntu2204-docker-8c-8g"
     node: "{build-node}"
     recipients: ""
     java-version: "openjdk17"
@@ -58,10 +58,10 @@
     disabled: false
 
     project-type: freestyle
-    build-node: "ubuntu1804-docker-8c-8g"
+    build-node: "ubuntu2204-docker-8c-8g"
     node: "{build-node}"
     recipients: ""
-    java-version: "openjdk17"
+    java-version: "openjdk21"
     python-version: python3
     mvn-version: "mvn36"
     maven-version: "mvn36"

diff --git a/jjb/policy/policy-csit-verify.yaml b/jjb/policy/policy-csit-verify.yaml
index 5955dd4..b0435f4 100644 (file)
--- a/jjb/policy/policy-csit-verify.yaml
+++ b/jjb/policy/policy-csit-verify.yaml
@@ -8,10 +8,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "distribution"
 
@@ -24,10 +24,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "xacml-pdp"
 
@@ -42,6 +42,8 @@
           branch: "master"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "opa-pdp"
 
@@ -54,10 +56,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "drools-applications"
 
@@ -70,10 +72,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "drools-pdp"
 
@@ -86,10 +88,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "apex-pdp"
 
@@ -102,10 +104,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "pap"
 
@@ -118,10 +120,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "api"
 
@@ -134,9 +136,9 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "clamp"

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 0ece3cd..c50306b 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -9,10 +9,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "distribution"
 
@@ -26,10 +26,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "xacml-pdp"
 
@@ -45,6 +45,8 @@
           branch: "master"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "policy-opa-pdp"
 
@@ -58,10 +60,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "drools-applications"
 
@@ -75,10 +77,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "drools-pdp"
 
@@ -92,10 +94,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "apex-pdp"
 
@@ -109,10 +111,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "pap"
 
@@ -126,10 +128,10 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "api"
 
@@ -143,9 +145,9 @@
     stream:
       - "master":
           branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     functionality:
       - "clamp"

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 98dc6e5..af276fe 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -26,12 +26,10 @@
 
     project: "policy/distribution"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-distribution-settings"
@@ -40,56 +38,90 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-distribution-java-21
+    project-name: "policy-distribution"
+    project: "policy/distribution"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          maven-versions-plugin: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+
 - project:
     name: policy-distribution-sonar
+    project: "policy/distribution"
+    project-name: "policy-distribution"
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
-    project: "policy/distribution"
-    project-name: "policy-distribution"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-distribution-settings"
-    java-version: openjdk17
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
     cron: "@daily"
 
 - project:
     name: policy-distribution-sonar-verify
+    project: "policy/distribution"
+    project-name: "policy-distribution"
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-docker-8c-8g
-    project: "policy/distribution"
-    project-name: "policy-distribution"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-distribution-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
-    java-version: openjdk17
     sonarcloud-qualitygate-wait: true
 
 - project:
     name: policy-distribution-clm
+    project: policy/distribution
+    project-name: "policy-distribution"
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: "onap-"
-    project: policy/distribution
-    project-name: "policy-distribution"
     stream:
       - "master":
           branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-distribution-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    java-version: openjdk17
+    java-version: openjdk21

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 6362bf2..aa06f64 100644 (file)
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -26,16 +26,46 @@
 
     project: "policy/docker"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     files: "**"
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-docker-base-common-java-21
+    project-name: "policy-docker"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker"
+          build-node: ubuntu2204-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu2204-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: ubuntu2204-docker-8c-8g
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "policy-docker-settings"
+    mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    java-version: openjdk21
+    project: "policy/docker"
+    stream:
+      - "master":
+          branch: "master"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-docker-8c-8g
+
 - project:
     name: policy-docker-clm
     jobs:
@@ -46,9 +76,9 @@
     stream:
       - "master":
           branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-docker-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    java-version: openjdk17
+    java-version: openjdk21

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index e861ae2..1349bf9 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -26,12 +26,10 @@
 
     project: "policy/drools-applications"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-settings: "policy-drools-applications-settings"
     mvn-version: "mvn36"
     maven-version: "mvn36"
@@ -40,60 +38,93 @@
     archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
+- project:
+    name: policy-drools-applications-java-21
+    project-name: "policy-drools-applications"
+    project: "policy/drools-applications"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          maven-versions-plugin: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+
 - project:
     name: policy-drools-applications-sonar
+    project: "policy/drools-applications"
+    project-name: "policy-drools-applications"
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
-    project: "policy/drools-applications"
-    project-name: "policy-drools-applications"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-settings: "policy-drools-applications-settings"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    java-version: openjdk17
-    java-opts: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
+    java-opts: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     cron: "@daily"
 
 - project:
     name: policy-drools-applications-sonar-verify
+    project: "policy/drools-applications"
+    project-name: "policy-drools-applications"
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-docker-8c-8g
-    project: "policy/drools-applications"
-    project-name: "policy-drools-applications"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-drools-applications-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
-    java-version: openjdk17
     java-opts: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     sonarcloud-qualitygate-wait: true
 
 - project:
     name: policy-drools-applications-clm
+    project: policy/drools-applications
+    project-name: "policy-drools-applications"
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: "onap-"
-    project: policy/drools-applications
-    project-name: "policy-drools-applications"
     stream:
       - "master":
           branch: "master"
-    mvn-settings: "policy-drools-applications-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    java-version: openjdk17
-    build-node: ubuntu1804-docker-8c-8g
+    java-version: openjdk21

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 0000ce6..4d25b40 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -26,12 +26,10 @@
 
     project: "policy/drools-pdp"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-drools-pdp-settings"
@@ -40,57 +38,90 @@
     archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
+- project:
+    name: policy-drools-pdp-java-21
+    project-name: "policy-drools-pdp"
+    project: "policy/drools-pdp"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          maven-versions-plugin: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+
 - project:
     name: policy-drools-pdp-sonar
+    project: "policy/drools-pdp"
+    project-name: "policy-drools-pdp"
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
-    project: "policy/drools-pdp"
-    project-name: "policy-drools-pdp"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-drools-pdp-settings"
-    java-version: openjdk17
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
     cron: "@daily"
 
 - project:
     name: policy-drools-pdp-sonar-verify
+    project: "policy/drools-pdp"
+    project-name: "policy-drools-pdp"
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-docker-8c-8g
-    project: "policy/drools-pdp"
-    project-name: "policy-drools-pdp"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-drools-pdp-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
-    java-version: openjdk17
     sonarcloud-qualitygate-wait: true
 
 - project:
     name: policy-drools-pdp-clm
-    jobs:
-      - gerrit-maven-clm:
-          mvn-params: "-Dmaven.test.skip=true"
-    nexus-iq-namespace: "onap-"
     project: policy/drools-pdp
     project-name: "policy-drools-pdp"
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
     stream:
       - "master":
           branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-drools-pdp-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    java-version: openjdk17
+    java-version: openjdk21

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 7d8b242..8f40adb 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -26,12 +26,10 @@
 
     project: "policy/models"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-models-settings"
@@ -40,56 +38,90 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-models-java-21
+    project-name: "policy-models"
+    project: "policy/models"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          maven-versions-plugin: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+
 - project:
     name: policy-models-sonar
+    project: "policy/models"
+    project-name: "policy-models"
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
-    project: "policy/models"
-    project-name: "policy-models"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-models-settings"
-    java-version: openjdk17
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
     cron: "@daily"
 
 - project:
     name: policy-models-sonar-verify
+    project: "policy/models"
+    project-name: "policy-models"
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-docker-8c-8g
-    project: "policy/models"
-    project-name: "policy-models"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-models-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
-    java-version: openjdk17
     sonarcloud-qualitygate-wait: true
 
 - project:
     name: policy-models-clm
+    project: policy/models
+    project-name: "policy-models"
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: "onap-"
-    project: policy/models
-    project-name: "policy-models"
     stream:
       - "master":
           branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-models-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    java-version: openjdk17
+    java-version: openjdk21

diff --git a/jjb/policy/policy-opa-pdp.yaml b/jjb/policy/policy-opa-pdp.yaml
index cfe2f28..4b6eadc 100644 (file)
--- a/jjb/policy/policy-opa-pdp.yaml
+++ b/jjb/policy/policy-opa-pdp.yaml
@@ -34,6 +34,8 @@
           branch: "master"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-settings: "policy-opa-pdp-settings"
 
 - project:

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 39d1579..08ae52b 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -26,12 +26,10 @@
 
     project: "policy/pap"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-pap-settings"
@@ -40,56 +38,90 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-pap-java-21
+    project-name: "policy-pap"
+    project: "policy/pap"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          maven-versions-plugin: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+
 - project:
     name: policy-pap-sonar
+    project: "policy/pap"
+    project-name: "policy-pap"
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
-    project: "policy/pap"
-    project-name: "policy-pap"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-pap-settings"
-    java-version: openjdk17
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
     cron: "@daily"
 
 - project:
     name: policy-pap-sonar-verify
+    project: "policy/pap"
+    project-name: "policy-pap"
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-docker-8c-8g
-    project: "policy/pap"
-    project-name: "policy-pap"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-pap-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
-    java-version: openjdk17
     sonarcloud-qualitygate-wait: true
 
 - project:
     name: policy-pap-clm
+    project: policy/pap
+    project-name: "policy-pap"
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: "onap-"
-    project: policy/pap
-    project-name: "policy-pap"
     stream:
       - "master":
           branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-pap-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    java-version: openjdk17
+    java-version: openjdk21

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index e065062..8ea9e1e 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -16,12 +16,10 @@
 
     project: "policy/parent"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-parent-settings"
@@ -30,6 +28,32 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-parent-java-21
+    project-name: "policy-parent"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: ubuntu2204-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: ubuntu2204-docker-8c-8g
+    project: "policy/parent"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "policy-parent-settings"
+    java-version: openjdk21
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-builder-4c-4g
+
 - project:
     name: policy-parent-clm
     jobs:
@@ -40,8 +64,8 @@
     stream:
       - "master":
           branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-parent-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    java-version: openjdk17
+    java-version: openjdk21

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 037bb40..8698531 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -26,12 +26,10 @@
 
     project: "policy/xacml-pdp"
     stream:
-      - "master":
-          branch: "master"
-      - "oslo":
-          branch: "oslo"
       - "paris":
           branch: "paris"
+      - "quebec":
+          branch: "quebec"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-xacml-pdp-settings"
@@ -40,56 +38,90 @@
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-xacml-pdp-java-21
+    project-name: "policy-xacml-pdp"
+    project: "policy/xacml-pdp"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu2204-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          maven-versions-plugin: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+
 - project:
     name: policy-xacml-pdp-sonar
+    project: "policy/xacml-pdp"
+    project-name: "policy-xacml-pdp"
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
-    project: "policy/xacml-pdp"
-    project-name: "policy-xacml-pdp"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-xacml-pdp-settings"
-    java-version: openjdk17
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
     cron: "@daily"
 
 - project:
     name: policy-xacml-pdp-sonar-verify
+    project: "policy/xacml-pdp"
+    project-name: "policy-xacml-pdp"
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-docker-8c-8g
-    project: "policy/xacml-pdp"
-    project-name: "policy-xacml-pdp"
+    build-node: ubuntu2204-docker-8c-8g
     branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-xacml-pdp-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
+    java-version: openjdk21
     mvn-goals: "clean install"
-    java-version: openjdk17
     sonarcloud-qualitygate-wait: true
 
 - project:
     name: policy-xacml-pdp-clm
+    project: policy/xacml-pdp
+    project-name: "policy-xacml-pdp"
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: "onap-"
-    project: policy/xacml-pdp
-    project-name: "policy-xacml-pdp"
     stream:
       - "master":
           branch: "master"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    mvn-settings: "policy-xacml-pdp-settings"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "{project-name}-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    java-version: openjdk17
+    java-version: openjdk21