From 5b0faffcb99bb520786c45d9f58d83a094dcf7b1 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Fri, 30 Aug 2019 12:45:08 -0700 Subject: [PATCH] Fix APPC GC Maven issues APPC needs both JAVA and MVN opts set to: -Xmx4000m -XX:MaxPermSize=256m Add support for local java verify job. Issue-ID: CIMAN-33 Change-Id: I76a82a05ec66b6d8584471685ec9e72df0bb8de4 Signed-off-by: Jessica Wagantall --- jjb/appc/appc-master.yaml | 3 ++- jjb/global-templates-java.yaml | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 043950539..80c568d08 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -4,8 +4,9 @@ project-name: 'appc' jobs: - '{project-name}-{stream}-verify-java': - mvn-params: '-DMAVEN_OPTS=-Xmx1024m -XX:MaxPermSize=256m' build-node: ubuntu1604-builder-8c-8g + mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" + java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - '{project-name}-{stream}-merge-java': build-node: ubuntu1604-builder-8c-8g - gerrit-maven-stage: diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index c7fe3cf80..b919c1f2a 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -15,6 +15,8 @@ node: '{build-node}' pattern: '**' pom: + mvn-opts: '' + java-opts: '' properties: - infra-properties: @@ -58,6 +60,10 @@ pom: '{obj:pom}' goals: 'clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}' + properties: + - MAVEN_OPTS='{mvn-opts}' + java-opts: + - "{java-opts}" settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' -- 2.16.6