X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fpolicy%2Fpolicy-drools-pdp.yaml;h=6440e3578f7c1199e72c18a923eaa687ffa022b4;hb=e6e95b7a5456b696c31f72e1deedffd89cccaa27;hp=b0ded4a3592a7e2f87427f5173f30db0344a3708;hpb=0e762b8c9de3cdf73e8660fa4c21d50b19b29456;p=ci-management.git

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index b0ded4a35..2b4337538 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -1,93 +1,115 @@
 ---
 - 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"
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-P docker'
-          disabled: true
       - 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:
-          build-node: ubuntu1604-docker-8c-8g
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
-          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:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-drools-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+      - "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: ""
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
-    name: policy-drools-pdp-dublin
-    project-name: 'policy-drools-pdp-dublin'
+    name: policy-drools-pdp-java-17
+    project-name: "policy-drools-pdp"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'policy/drools-pdp'
+      - "{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:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-drools-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    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:
       - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'policy/drools-pdp'
-    project-name: 'policy-drools-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-drools-pdp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonarcloud: true
+    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-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-drools-pdp-settings"
+    java-version: openjdk17
+    mvn-goals: "clean install"
 
 - project:
     name: policy-drools-pdp-clm
     jobs:
       - gerrit-maven-clm:
-          mvn-params: '-DskipTests'
-    nexus-iq-namespace: 'onap-'
-    project: policy/drools-pdp
-    project-name: 'policy-drools-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-drools-pdp-settings'
-
-- project:
-    name: policy-drools-pdp-info
-    project-name: policy-drools-pdp
-    jobs:
-      - gerrit-info-yaml-verify
+          mvn-params: "-Dmaven.test.skip=true"
+    nexus-iq-namespace: "onap-"
     project: policy/drools-pdp
-    branch: master
+    project-name: "policy-drools-pdp"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-drools-pdp-settings"
+    java-version: openjdk17