diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2019-09-03 19:28:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-03 19:28:25 +0000 |
| commit | 428d943347e054576fb801f4c57f1c50a3dd05ac (patch) | |
| tree | 0873856d2804ec9726e16bd4f433624ed066d6ca /jjb | |
| parent | b5658110a5ad6e9dcef56cb7871a20b3879c7f1b (diff) | |
| parent | b7778e6aafb3dd8b600c11699f6862d64b1b8a36 (diff) | |
Merge "Fix APPC GC Maven Merge Job"
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 881b045e8..c589fbae8 100644 --- 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' |