Merge "Fix APPC GC Maven Merge Job"

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 80c568d..16a7172 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -9,6 +9,8 @@
           java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - '{project-name}-{stream}-merge-java':
           build-node: ubuntu1604-builder-8c-8g
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+          java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 881b045..c589fba 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -578,6 +578,8 @@
     pom:
     mvn_properties: []
     mvn-params: ''
+    mvn-opts: ''
+    java-opts: ''
 
     properties:
       - infra-properties:
@@ -619,6 +621,10 @@
           pom: '{obj:pom}'
           goals: 'clean deploy -B {mvn-params}
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+          properties:
+            - MAVEN_OPTS='{mvn-opts}'
+          java-opts:
+            - "{java-opts}"
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'