Fix APPC GC Maven Merge Job
Add JAVA and MVN opts set for merge job.
Issue-ID: CIMAN-33
Signed-off-by: Houa Yang <hyang@contractor.linuxfoundation.org>
Change-Id: I4bc2730aa96aa0ca39c81b50112449e5b18145f2
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 80c568d..16a7172 100644
--- 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 b919c1f..4305b71 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -576,6 +576,8 @@
pom:
mvn_properties: []
mvn-params: ''
+ mvn-opts: ''
+ java-opts: ''
properties:
- infra-properties:
@@ -617,6 +619,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'