Skip to content

Commit fc86cb5

Browse files
committed
[Build] Define max heap-size for Maven only via environment variables
This avoids confusion which value is actually used and allows to reduce the memory demand of the kubernetes-pod used to run I/Y-builds.
1 parent 83a28d9 commit fc86cb5

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.mvn/jvm.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
-XX:+PrintFlagsFinal
2-
-Xmx3G

JenkinsJobs/Builds/build.jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ spec:
4949
- name: "jnlp"
5050
resources:
5151
limits:
52-
memory: "10Gi"
52+
memory: "8Gi"
5353
cpu: "4000m"
5454
requests:
55-
memory: "6144Mi"
55+
memory: "6Gi"
5656
cpu: "2000m"
5757
"""
5858
}
@@ -67,7 +67,7 @@ spec:
6767
BUILD_TYPE_NAME = "${BUILD.typeName}"
6868
PATCH_OR_BRANCH_LABEL = "${BUILD.branchLabel}"
6969

70-
MAVEN_OPTS = "-Xmx6G"
70+
MAVEN_OPTS = '-Xmx4G'
7171
CJE_ROOT = "${WORKSPACE}/cje-production"
7272
logDir = "$CJE_ROOT/buildlogs"
7373
TEST_CONFIGURATIONS_EXPECTED = "${testConfigurationsExpected}"

Jenkinsfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ pipeline {
1212
maven 'apache-maven-latest'
1313
jdk 'temurin-jdk21-latest'
1414
}
15+
environment {
16+
MAVEN_OPTS = '-Xmx3G'
17+
}
1518
stages {
1619
stage('Use master') {
1720
steps {

cje-production/buildproperties.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,4 @@ BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
5151
ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.35-I-builds/"
5252

5353
#Maven parameters
54-
MAVEN_OPTS="-Xmx6G"
5554
JAVA_DOC_TOOL="-Declipse.javadoc=/opt/tools/java/openjdk/jdk-17/latest/bin/javadoc"

0 commit comments

Comments
 (0)