X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpolicy%2Fpolicy-drools-pdp.yaml;h=10b11b1e08632291ac37b81765d3eded7b047aa7;hb=eb91978ec9ceb31ed8bdc7a7043638405bfb1242;hp=23b00cc19ebebe56ea17ebc5bb27890e700e88db;hpb=8cc4ce1989170b79b9a887deda82e8fa0ee0cb92;p=ci-management.git

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 23b00cc19..10b11b1e0 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -1,66 +1,82 @@
 ---
 - project:
     name: policy-drools-pdp
-    project-name: 'policy-drools-pdp'
+    project-name: "policy-drools-pdp"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+      - "{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: centos7-builder-4c-4g
+          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-8c-8g
+          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'
+    project: "policy/drools-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'policy-drools-pdp-settings'
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+      - "london":
+          branch: "london"
+    mvn-settings: "policy-drools-pdp-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
-    name: policy-drools-pdp-jdk8
-    project-name: 'policy-drools-pdp'
+    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'
+      - "{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: centos7-builder-4c-4g
+          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'
+          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'
+    project: "policy/drools-pdp"
     stream:
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'policy-drools-pdp-settings'
-    java-version: openjdk8
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "policy-drools-pdp-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
@@ -68,37 +84,33 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/drools-pdp'
-    project-name: 'policy-drools-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-drools-pdp-settings'
-    java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "policy/drools-pdp"
+    project-name: "policy-drools-pdp"
+    branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "policy-drools-pdp-settings"
+    java-version: openjdk17
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-drools-pdp-clm
     jobs:
       - gerrit-maven-clm:
-          mvn-params: '-DskipTests'
-    nexus-iq-namespace: 'onap-'
+          mvn-params: "-Dmaven.test.skip=true"
+    nexus-iq-namespace: "onap-"
     project: policy/drools-pdp
-    project-name: 'policy-drools-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-drools-pdp-settings'
-    java-version: openjdk11
-
-- project:
-    name: policy-drools-pdp-info
-    project-name: policy-drools-pdp
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: policy/drools-pdp
-    branch: master
+    project-name: "policy-drools-pdp"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    mvn-settings: "policy-drools-pdp-settings"
+    java-version: openjdk17