[POLICY] Revert master branch jobs to java11 80/135780/3
authorwaynedunican <wayne.dunican@est.tech>
Mon, 21 Aug 2023 09:40:06 +0000 (10:40 +0100)
committerwaynedunican <wayne.dunican@est.tech>
Thu, 24 Aug 2023 08:32:37 +0000 (09:32 +0100)
- Temporarily move "master" build jobs to Java 11
- Java 17 jobs for "java-17" branches will run
- Add CSITs
- Add drools and xacml java 17 builds

Issue-ID: POLICY-4785
Change-Id: I24cc56ef7fa9866002cc737450557837524b90d4
Signed-off-by: waynedunican <wayne.dunican@est.tech>
13 files changed:
jjb/policy/policy-apex-pdp.yaml
jjb/policy/policy-api.yaml
jjb/policy/policy-clamp.yaml
jjb/policy/policy-common.yaml
jjb/policy/policy-csit.yaml
jjb/policy/policy-distribution.yaml
jjb/policy/policy-docker-base-common.yaml
jjb/policy/policy-drools-applications.yaml
jjb/policy/policy-drools-pdp.yaml
jjb/policy/policy-models.yaml
jjb/policy/policy-pap.yaml
jjb/policy/policy-parent.yaml
jjb/policy/policy-xacml-pdp.yaml

index ed43f4a..b267a80 100644 (file)
@@ -6,7 +6,7 @@
       - project-view
 
 - project:
-    name: policy-apex-pdp
+    name: policy-apex-pdp-java-17
     project-name: "policy-apex-pdp"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -32,8 +32,6 @@
 
     project: "policy/apex-pdp"
     stream:
-      - "master":
-          branch: "master"
       - "java-17":
           branch: "java-17"
     mvn-settings: "policy-apex-pdp-settings"
@@ -43,7 +41,7 @@
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
-    name: policy-apex-pdp-java11
+    name: policy-apex-pdp
     project-name: "policy-apex-pdp"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -69,6 +67,8 @@
 
     project: "policy/apex-pdp"
     stream:
+      - "master":
+          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -99,7 +99,7 @@
     project-name: "policy-apex-pdp"
     branch: "master"
     mvn-settings: "policy-apex-pdp-settings"
-    java-version: openjdk17
+    java-version: openjdk11
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
       - "master":
           branch: "master"
     mvn-settings: "policy-apex-pdp-settings"
-    java-version: openjdk17
+    java-version: openjdk11
index 37bfeaa..04f4276 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-api
+    name: policy-api-java-17
     project-name: "policy-api"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -26,8 +26,6 @@
 
     project: "policy/api"
     stream:
-      - "master":
-          branch: "master"
       - "java-17":
           branch: "java-17"
     mvn-settings: "policy-api-settings"
@@ -63,6 +61,8 @@
 
     project: "policy/api"
     stream:
+      - "master":
+          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -93,7 +93,7 @@
     project-name: "policy-api"
     branch: "master"
     mvn-settings: "policy-api-settings"
-    java-version: openjdk17
+    java-version: openjdk11
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
       - "master":
           branch: "master"
     mvn-settings: "policy-api-settings"
-    java-version: openjdk17
+    java-version: openjdk11
index 9758bba..5d439e8 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-clamp
+    name: policy-clamp-java-17
     project-name: "policy-clamp"
     jobs:
       - gerrit-maven-stage:
@@ -17,7 +17,6 @@
           container-staging-registry: "nexus3.onap.org:10003"
           mvn-params: "-Dmaven.test.skip=true -P docker"
       - "{project-name}-{stream}-verify-java":
-          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-16g
       - "{project-name}-{stream}-merge-java":
           build-node: ubuntu1804-docker-8c-16g
@@ -27,8 +26,6 @@
 
     project: "policy/clamp"
     stream:
-      - "master":
-          branch: "master"
       - "java-17":
           branch: "java-17"
     mvn-settings: "policy-clamp-settings"
@@ -65,6 +62,8 @@
 
     project: "policy/clamp"
     stream:
+      - "master":
+          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -97,7 +96,7 @@
     mvn-settings: "policy-clamp-settings"
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
-    java-version: openjdk17
+    java-version: openjdk11
 
 - project:
     name: policy-clamp-clm
           branch: "master"
     mvn-settings: "policy-clamp-settings"
     build-node: ubuntu1804-docker-8c-8g
-    java-version: openjdk17
+    java-version: openjdk11
index 4d611a8..d01bb1d 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-common
+    name: policy-common-java-17
     project-name: "policy-common"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -16,8 +16,6 @@
 
     project: "policy/common"
     stream:
-      - "master":
-          branch: "master"
       - "java-17":
           branch: "java-17"
     mvn-settings: "policy-common-settings"
@@ -43,6 +41,8 @@
 
     project: "policy/common"
     stream:
+      - "master":
+          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -73,7 +73,7 @@
     project-name: "policy-common"
     branch: "master"
     mvn-settings: "policy-common-settings"
-    java-version: openjdk17
+    java-version: openjdk11
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
@@ -88,4 +88,4 @@
       - "master":
           branch: "master"
     mvn-settings: "policy-common-settings"
-    java-version: openjdk17
+    java-version: openjdk11
index f5e42e7..a7d1e38 100644 (file)
       - "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:
       - "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:
       - "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:
       - "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:
       - "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:
       - "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:
       - "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:
       - "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:
index 773d2a3..b673b3f 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-distribution
+    name: policy-distribution-java-17
     project-name: "policy-distribution"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -26,8 +26,6 @@
 
     project: "policy/distribution"
     stream:
-      - "master":
-          branch: "master"
       - "java-17":
           branch: "java-17"
     mvn-settings: "policy-distribution-settings"
@@ -63,6 +61,8 @@
 
     project: "policy/distribution"
     stream:
+      - "master":
+          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -93,7 +93,7 @@
     project-name: "policy-distribution"
     branch: "master"
     mvn-settings: "policy-distribution-settings"
-    java-version: openjdk17
+    java-version: openjdk11
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
       - "master":
           branch: "master"
     mvn-settings: "policy-distribution-settings"
-    java-version: openjdk17
+    java-version: openjdk11
index 753d522..3477105 100644 (file)
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-docker-base-common-java-17
+    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: ubuntu1804-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu1804-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: centos7-docker-2c-1g
+    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"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
 - project:
     name: policy-docker-clm
     jobs:
index d8263df..a7ff6b9 100644 (file)
     archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
+- project:
+    name: policy-drools-applications-java-17
+    project-name: "policy-drools-applications"
+    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
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu1804-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: centos7-docker-2c-1g
+
+    project: "policy/drools-applications"
+    stream:
+      - "java-17":
+          branch: "java-17"
+    mvn-settings: "policy-drools-applications-settings"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
+
 - project:
     name: policy-drools-applications-sonar
     jobs:
index 123eb8a..8f1a5be 100644 (file)
     archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
+- project:
+    name: policy-drools-pdp-java-17
+    project-name: "policy-drools-pdp"
+    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
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu1804-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: centos7-docker-2c-1g
+
+    project: "policy/drools-pdp"
+    stream:
+      - "java-17":
+          branch: "java-17"
+    mvn-settings: "policy-drools-pdp-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
+
 - project:
     name: policy-drools-pdp-sonar
     jobs:
index bdc6292..180b022 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-models
+    name: policy-models-java-17
     project-name: "policy-models"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -26,8 +26,6 @@
 
     project: "policy/models"
     stream:
-      - "master":
-          branch: "master"
       - "java-17":
           branch: "java-17"
     mvn-settings: "policy-models-settings"
@@ -63,6 +61,8 @@
 
     project: "policy/models"
     stream:
+      - "master":
+          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -93,7 +93,7 @@
     project-name: "policy-models"
     branch: "master"
     mvn-settings: "policy-models-settings"
-    java-version: openjdk17
+    java-version: openjdk11
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
       - "master":
           branch: "master"
     mvn-settings: "policy-models-settings"
-    java-version: openjdk17
+    java-version: openjdk11
index 7716dd9..2902dbe 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-pap
+    name: policy-pap-java-17
     project-name: "policy-pap"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -26,8 +26,6 @@
 
     project: "policy/pap"
     stream:
-      - "master":
-          branch: "master"
       - "java-17":
           branch: "java-17"
     mvn-settings: "policy-pap-settings"
@@ -63,6 +61,8 @@
 
     project: "policy/pap"
     stream:
+      - "master":
+          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -93,7 +93,7 @@
     project-name: "policy-pap"
     branch: "master"
     mvn-settings: "policy-pap-settings"
-    java-version: openjdk17
+    java-version: openjdk11
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
       - "master":
           branch: "master"
     mvn-settings: "policy-pap-settings"
-    java-version: openjdk17
+    java-version: openjdk11
index 24c126e..520efcd 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-parent
+    name: policy-parent-java-17
     project-name: "policy-parent"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -16,8 +16,6 @@
 
     project: "policy/parent"
     stream:
-      - "master":
-          branch: "master"
       - "java-17":
           branch: "java-17"
     mvn-settings: "policy-parent-settings"
@@ -43,6 +41,8 @@
 
     project: "policy/parent"
     stream:
+      - "master":
+          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -70,4 +70,4 @@
       - "master":
           branch: "master"
     mvn-settings: "policy-parent-settings"
-    java-version: openjdk17
+    java-version: openjdk11
index 15ed686..fbd2ec7 100644 (file)
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
+- project:
+    name: policy-xacml-pdp-java-17
+    project-name: "policy-xacml-pdp"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
+          build-node: ubuntu1804-docker-8c-8g
+      - 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"
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu1804-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: centos7-docker-2c-1g
+
+    project: "policy/xacml-pdp"
+    stream:
+      - "java-17":
+          branch: "java-17"
+    mvn-settings: "policy-xacml-pdp-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
 - project:
     name: policy-xacml-pdp-sonar
     jobs: