From: jhh <jorge.hernandez-herrero@att.com>
Date: Tue, 24 May 2022 15:58:44 +0000 (-0500)
Subject: policy drools apps merge job not using java-opts
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f449a12d5240213fb23ba10431d2f1a01ccbf1f6;p=ci-management.git

policy drools apps merge job not using java-opts

The jvm option to prefer IPv4 was replaced with
maven opts as it seems that the merge job does
not look at jvm-opts.

Issue-ID: POLICY-4213
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I15977498c8a26789024cac890982010eac1707be
---

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index dc8142515..955499a51 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -7,8 +7,7 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-          mvn-params: "-P docker"
-          java-opts: '-Djava.net.preferIPv4Stack=true'
+          mvn-params: "-P docker -Djava.net.preferIPv4Stack=true"
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
@@ -56,6 +55,7 @@
     branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
     java-version: openjdk11
+    java-opts: '-Djava.net.preferIPv4Stack=true'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -76,6 +76,7 @@
       - 'jakarta':
           branch: 'jakarta'
     mvn-settings: 'policy-drools-applications-settings'
+    mvn-params: "-Djava.net.preferIPv4Stack=true"
     java-version: openjdk11
     build-node: ubuntu1804-docker-8c-8g