Merge "[modeling] Add jobs for new project yang-kit"

diff --git a/jenkins-config/managed-config-files/custom/pypirc/content b/jenkins-config/managed-config-files/custom/pypirc/content
index 7103c83..a5b368b 100644 (file)
--- a/jenkins-config/managed-config-files/custom/pypirc/content
+++ b/jenkins-config/managed-config-files/custom/pypirc/content
@@ -4,6 +4,7 @@ index-servers =
    release
    pypi-test
    pypi
+   pypi-onapsdk
 
 [staging]
 repository: https://nexus3.onap.org/repository/PyPi.staging/

diff --git a/jjb/integration/integration-python-onapsdk.yaml b/jjb/integration/integration-python-onapsdk.yaml
index 4653cf1..067e607 100644 (file)
--- a/jjb/integration/integration-python-onapsdk.yaml
+++ b/jjb/integration/integration-python-onapsdk.yaml
@@ -60,6 +60,7 @@
           branch: "master"
     jobs:
       - gerrit-pypi-verify
+      - gerrit-pypi-stage
       - gerrit-pypi-merge
 
 - project:

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index b267a80..bff1a37 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -32,8 +32,10 @@
 
     project: "policy/apex-pdp"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-apex-pdp-settings"
     java-version: openjdk17
     files: "**"
@@ -67,8 +69,6 @@
 
     project: "policy/apex-pdp"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -98,10 +98,11 @@
     project: "policy/apex-pdp"
     project-name: "policy-apex-pdp"
     branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-apex-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-apex-pdp-clm
@@ -113,5 +114,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-apex-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 04f4276..b37ee98 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -26,8 +26,10 @@
 
     project: "policy/api"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-api-settings"
     java-version: openjdk17
     files: "**"
@@ -61,8 +63,6 @@
 
     project: "policy/api"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -93,9 +93,10 @@
     project-name: "policy-api"
     branch: "master"
     mvn-settings: "policy-api-settings"
-    java-version: openjdk11
+    java-version: openjdk17
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-api-clm
@@ -107,5 +108,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-api-settings"
-    java-version: openjdk11
+    java-version: openjdk17

diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index 5d439e8..7f45cb6 100644 (file)
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -26,8 +26,10 @@
 
     project: "policy/clamp"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-clamp-settings"
     java-version: openjdk17
     files: "**"
@@ -62,8 +64,6 @@
 
     project: "policy/clamp"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -93,10 +93,11 @@
     project: "policy/clamp"
     project-name: "policy-clamp"
     branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-clamp-settings"
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     name: policy-clamp-clm
@@ -108,6 +109,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-clamp-settings"
     build-node: ubuntu1804-docker-8c-8g
-    java-version: openjdk11
+    java-version: openjdk17

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index d01bb1d..1b94e1e 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -16,8 +16,10 @@
 
     project: "policy/common"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-common-settings"
     java-version: openjdk17
     files: "**"
@@ -41,8 +43,6 @@
 
     project: "policy/common"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -72,10 +72,11 @@
     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 +88,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-common-settings"
-    java-version: openjdk11
+    java-version: openjdk17

diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
index b42b402..993a1fb 100644 (file)
--- a/jjb/policy/policy-csit-jobs.yaml
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -6,7 +6,7 @@
     build-node: "ubuntu1804-docker-8c-8g"
     node: "{build-node}"
     recipients: ""
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     python-version: python3
 
     properties:
@@ -63,7 +63,7 @@
     build-node: "ubuntu1804-docker-8c-8g"
     node: "{build-node}"
     recipients: ""
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     python-version: python3
 
     properties:

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index a7d1e38..f5e42e7 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -26,23 +26,6 @@
       - "policy-distribution-{stream}-merge-java"
       - "policy-docker-{stream}-merge-java"
 
-- project:
-    name: policy-distribution-project-csit-java-17
-    jobs:
-      - "{project-name}-{stream}-project-csit-verify-{functionality}"
-      - "{project-name}-{stream}-project-csit-{functionality}"
-    project-name: "policy-distribution"
-    recipients: "ram_krishna.verma@bell.ca"
-    project: "policy/docker"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "distribution"
-    trigger_jobs:
-      - "policy-distribution-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
-
 - project:
     name: policy-xacml-pdp-project-csit
     jobs:
@@ -70,23 +53,6 @@
       - "policy-xacml-pdp-{stream}-merge-java"
       - "policy-docker-{stream}-merge-java"
 
-- project:
-    name: policy-xacml-pdp-project-csit-java-17
-    jobs:
-      - "{project-name}-{stream}-project-csit-verify-{functionality}"
-      - "{project-name}-{stream}-project-csit-{functionality}"
-    project-name: "policy-xacml-pdp"
-    recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
-    project: "policy/docker"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "xacml-pdp"
-    trigger_jobs:
-      - "policy-xacml-pdp-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
-
 - project:
     name: policy-drools-applications-project-csit
     jobs:
@@ -114,23 +80,6 @@
       - "policy-drools-applications-{stream}-merge-java"
       - "policy-docker-{stream}-merge-java"
 
-- project:
-    name: policy-drools-applications-project-csit-java-17
-    jobs:
-      - "{project-name}-{stream}-project-csit-verify-{functionality}"
-      - "{project-name}-{stream}-project-csit-{functionality}"
-    project-name: "policy-drools-applications"
-    recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
-    project: "policy/docker"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "drools-applications"
-    trigger_jobs:
-      - "policy-drools-applications-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
-
 - project:
     name: policy-drools-pdp-project-csit
     jobs:
@@ -158,23 +107,6 @@
       - "policy-drools-pdp-{stream}-merge-java"
       - "policy-docker-{stream}-merge-java"
 
-- project:
-    name: policy-drools-pdp-project-csit-java-17
-    jobs:
-      - "{project-name}-{stream}-project-csit-verify-{functionality}"
-      - "{project-name}-{stream}-project-csit-{functionality}"
-    project-name: "policy-drools-pdp"
-    recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
-    project: "policy/docker"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "drools-pdp"
-    trigger_jobs:
-      - "policy-drools-pdp-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
-
 - project:
     name: policy-apex-pdp-project-csit
     jobs:
@@ -202,23 +134,6 @@
       - "policy-apex-pdp-{stream}-merge-java"
       - "policy-docker-{stream}-merge-java"
 
-- project:
-    name: policy-apex-pdp-project-csit-java-17
-    jobs:
-      - "{project-name}-{stream}-project-csit-verify-{functionality}"
-      - "{project-name}-{stream}-project-csit-{functionality}"
-    project-name: "policy-apex-pdp"
-    recipients: "liam.fallon@est.tech ram_krishna.verma@bell.ca"
-    project: "policy/docker"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "apex-pdp"
-    trigger_jobs:
-      - "policy-apex-pdp-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
-
 - project:
     name: policy-pap-project-csit
     jobs:
@@ -246,23 +161,6 @@
       - "policy-pap-{stream}-merge-java"
       - "policy-docker-{stream}-merge-java"
 
-- project:
-    name: policy-pap-project-csit-java-17
-    jobs:
-      - "{project-name}-{stream}-project-csit-verify-{functionality}"
-      - "{project-name}-{stream}-project-csit-{functionality}"
-    project-name: "policy-pap"
-    recipients: "jrh3@att.com ram_krishna.verma@bell.ca"
-    project: "policy/docker"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "pap"
-    trigger_jobs:
-      - "policy-pap-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
-
 - project:
     name: policy-api-project-csit
     jobs:
@@ -290,23 +188,6 @@
       - "policy-api-{stream}-merge-java"
       - "policy-docker-{stream}-merge-java"
 
-- project:
-    name: policy-api-project-csit-java-17
-    jobs:
-      - "{project-name}-{stream}-project-csit-verify-{functionality}"
-      - "{project-name}-{stream}-project-csit-{functionality}"
-    project-name: "policy-api"
-    recipients: "jrh3@att.com ram_krishna.verma@bell.ca"
-    project: "policy/docker"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "api"
-    trigger_jobs:
-      - "policy-api-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
-
 - project:
     name: policy-clamp-project-csit
     jobs:
@@ -334,23 +215,6 @@
       - "policy-clamp-{stream}-merge-java"
       - "policy-docker-{stream}-merge-java"
 
-- project:
-    name: policy-clamp-project-csit-java-17
-    jobs:
-      - "{project-name}-{stream}-project-csit-verify-{functionality}"
-      - "{project-name}-{stream}-project-csit-{functionality}"
-    project-name: "policy-clamp"
-    recipients: "jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com"
-    project: "policy/docker"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "clamp"
-    trigger_jobs:
-      - "policy-clamp-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
-
 - project:
     name: policy-apex-pdp-postgres-project-csit
     jobs:

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index b673b3f..31875f0 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -26,8 +26,10 @@
 
     project: "policy/distribution"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-distribution-settings"
     java-version: openjdk17
     files: "**"
@@ -61,8 +63,6 @@
 
     project: "policy/distribution"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -92,10 +92,11 @@
     project: "policy/distribution"
     project-name: "policy-distribution"
     branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-distribution-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-distribution-clm
@@ -107,5 +108,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-distribution-settings"
-    java-version: openjdk11
+    java-version: openjdk17

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 3477105..d21500c 100644 (file)
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -24,8 +24,6 @@
 
     project: "policy/docker"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -59,14 +57,16 @@
           container-staging-registry: "nexus3.onap.org:10003"
       - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-docker-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     java-version: openjdk17
 
     project: "policy/docker"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
     files: "**"
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
@@ -81,6 +81,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-docker-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
-    java-version: openjdk11
+    java-version: openjdk17

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index a7ff6b9..3d44a9c 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -26,8 +26,6 @@
 
     project: "policy/drools-applications"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -73,8 +71,8 @@
 
     project: "policy/drools-applications"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
     mvn-settings: "policy-drools-applications-settings"
     mvn-version: "mvn36"
     maven-version: "mvn36"
@@ -99,10 +97,9 @@
     mvn-settings: "policy-drools-applications-settings"
     mvn-version: "mvn36"
     maven-version: "mvn36"
-    java-version: openjdk11
+    java-version: openjdk17
     java-opts: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-drools-applications-clm
@@ -118,5 +115,5 @@
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     mvn-version: "mvn36"
     maven-version: "mvn36"
-    java-version: openjdk11
+    java-version: openjdk17
     build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 8f1a5be..2b43375 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -26,8 +26,6 @@
 
     project: "policy/drools-pdp"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -71,8 +69,10 @@
 
     project: "policy/drools-pdp"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-drools-pdp-settings"
     java-version: openjdk17
     files: "**"
@@ -92,10 +92,11 @@
     project: "policy/drools-pdp"
     project-name: "policy-drools-pdp"
     branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-drools-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-drools-pdp-clm
@@ -108,5 +109,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-drools-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 2ec00e2..7041691 100644 (file)
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -26,8 +26,6 @@
 
     project: "policy/gui"
     stream:
-      - "master":
-          branch: "master"
       - "istanbul":
           branch: "istanbul"
       - "jakarta":
@@ -69,8 +67,10 @@
 
     project: "policy/gui"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-gui-settings"
     java-version: openjdk17
     files: "**"
@@ -90,10 +90,11 @@
     project: "policy/gui"
     project-name: "policy-gui"
     branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-gui-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
@@ -106,5 +107,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-gui-settings"
-    java-version: openjdk11
+    java-version: openjdk17

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 180b022..696b788 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -26,8 +26,10 @@
 
     project: "policy/models"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-models-settings"
     java-version: openjdk17
     files: "**"
@@ -61,8 +63,6 @@
 
     project: "policy/models"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -92,10 +92,11 @@
     project: "policy/models"
     project-name: "policy-models"
     branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-models-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-models-clm
@@ -107,5 +108,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-models-settings"
-    java-version: openjdk11
+    java-version: openjdk17

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 2902dbe..3553efc 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -26,8 +26,10 @@
 
     project: "policy/pap"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-pap-settings"
     java-version: openjdk17
     files: "**"
@@ -61,8 +63,6 @@
 
     project: "policy/pap"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -92,10 +92,11 @@
     project: "policy/pap"
     project-name: "policy-pap"
     branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-pap-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-pap-clm
@@ -107,5 +108,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-pap-settings"
-    java-version: openjdk11
+    java-version: openjdk17

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 520efcd..3b67c44 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -16,8 +16,10 @@
 
     project: "policy/parent"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-parent-settings"
     java-version: openjdk17
     files: "**"
@@ -41,8 +43,6 @@
 
     project: "policy/parent"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -69,5 +69,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-parent-settings"
-    java-version: openjdk11
+    java-version: openjdk17

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index fbd2ec7..bb99ca5 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -26,8 +26,6 @@
 
     project: "policy/xacml-pdp"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -71,8 +69,10 @@
 
     project: "policy/xacml-pdp"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-xacml-pdp-settings"
     java-version: openjdk17
     files: "**"
@@ -92,10 +92,11 @@
     project: "policy/xacml-pdp"
     project-name: "policy-xacml-pdp"
     branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-xacml-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-xacml-pdp-clm
@@ -107,5 +108,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-xacml-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17