diff options
author | Houa Yang <hyang@contractor.linuxfoundation.org> | 2019-09-03 13:23:05 -0500 |
---|---|---|
committer | Houa Yang <hyang@contractor.linuxfoundation.org> | 2019-09-03 14:01:25 -0500 |
commit | b7778e6aafb3dd8b600c11699f6862d64b1b8a36 (patch) | |
tree | 7fd325fee8e98b7263f5ff89873148cb7d255afe /jjb | |
parent | 72a59c306dc077fdf1ea6d305be602247d8b8570 (diff) |
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
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/appc/appc-master.yaml | 2 | ||||
-rw-r--r-- | jjb/global-templates-java.yaml | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 80c568d08..16a7172d4 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 b919c1f2a..4305b71c7 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' |