X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpolicy%2Fpolicy-drools-applications.yaml;h=81559a7c9b4fb28826ce1413ef797372b1abd8f7;hb=033b99814add4901044df55101b78cedf701ddef;hp=8aa3f5d4453f3989ce4968c2ef6ee9da307f058f;hpb=7bc1a92d9bea8434d8e06dd0b73477dc5da94a22;p=ci-management.git

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 8aa3f5d44..81559a7c9 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -7,12 +7,15 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-          mvn-params: "-P docker"
+          mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
       - 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'
@@ -25,23 +28,29 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'policy-drools-applications-settings'
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
 
+
 - project:
     name: policy-drools-applications-sonar
     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'
@@ -50,7 +59,10 @@
     project-name: 'policy-drools-applications'
     branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     java-version: openjdk11
+    java-opts: '-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -61,8 +73,13 @@
     nexus-iq-namespace: 'onap-'
     project: policy/drools-applications
     project-name: 'policy-drools-applications'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
+    mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     java-version: openjdk11
     build-node: ubuntu1804-docker-8c-8g
 
@@ -71,6 +88,6 @@
     project-name: policy-drools-applications
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: policy/drools-applications
     branch: master