Skip to content

experiment do not merge #10135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AlexeyKuznetsov-DD wants to merge 7 commits into from
Closed

experiment do not merge #10135

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ccfc0c4
GitLab CI jvm memory configuration refactored to percentage
AlexeyKuznetsov-DD Dec 9, 2025
f5b98a0
Trigger CI
AlexeyKuznetsov-DD Dec 9, 2025
111bd5a
Merge branch 'master' into alexeyk/ci-memory-percentage
AlexeyKuznetsov-DD Dec 9, 2025
57e7c0a
Split jobs to more partitions to relax contention on prefs.
AlexeyKuznetsov-DD Dec 9, 2025
802e305
Merge branch 'master' into alexeyk/ci-memory-percentage
AlexeyKuznetsov-DD Dec 9, 2025
a1cbf6a
Merge branch 'master' into alexeyk/ci-memory-percentage
AlexeyKuznetsov-DD Dec 12, 2025
c96c252
Some tweaks
AlexeyKuznetsov-DD Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ default:
stage: build
variables:
MAVEN_OPTS: "-Xms256M -Xmx1024M"
GRADLE_WORKERS: 2
GRADLE_MEM: 3G
GRADLE_MEM_PERCENTAGE: "70.0"
KUBERNETES_CPU_REQUEST: 8
KUBERNETES_MEMORY_REQUEST: 10Gi
KUBERNETES_MEMORY_LIMIT: 10Gi
Expand Down Expand Up @@ -184,8 +183,8 @@ default:
# replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
- sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
- mkdir -p .mvn/caches
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
- export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-XX:MaxRAMPercentage=$GRADLE_MEM_PERCENTAGE -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
- export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel"
- *normalize_node_index
# for weird reasons, gradle will always "chmod 700" the .gradle folder
# with Gitlab caching, .gradle is always owned by root and thus gradle's chmod invocation fails
Expand Down Expand Up @@ -281,8 +280,7 @@ build_tests:
variables:
BUILD_CACHE_POLICY: push
DEPENDENCY_CACHE_POLICY: pull
GRADLE_MEM: 4G
GRADLE_WORKERS: 3
GRADLE_MEM_PERCENTAGE: "80.0"
KUBERNETES_MEMORY_REQUEST: 18Gi
KUBERNETES_MEMORY_LIMIT: 18Gi
parallel:
Expand Down Expand Up @@ -365,12 +363,11 @@ spotless:
stage: tests
needs: []
variables:
# TODO: Latest version of spotless is failing with OOM on CI only.
# Setting 8G memory solving this issue, but we need to solve it eventually.
GRADLE_MEM: 8G
GRADLE_MEM_PERCENTAGE: "80.0"
KUBERNETES_MEMORY_REQUEST: 18Gi
KUBERNETES_MEMORY_LIMIT: 18Gi
script:
- echo "GRADLE_OPTS_DBG3: ${GRADLE_OPTS}"
- ./gradlew --version
- ./gradlew spotlessCheck $GRADLE_ARGS

Expand All @@ -394,10 +391,10 @@ test_published_artifacts:
- rm -rf "${mvn_local_repo}/com/datadoghq"
- export GPG_PRIVATE_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.signing.gpg_private_key --with-decryption --query "Parameter.Value" --out text)
- export GPG_PASSWORD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.signing.gpg_passphrase --with-decryption --query "Parameter.Value" --out text)
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms2G -Xmx2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
- echo "GRADLE_OPTS_DBG1: ${GRADLE_OPTS}"
- ./gradlew publishToMavenLocal $GRADLE_ARGS
- cd test-published-dependencies
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms1G -Xmx1G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
- echo "GRADLE_OPTS_DBG2: ${GRADLE_OPTS}"
- ./gradlew --version
- ./gradlew check --info $GRADLE_ARGS
after_script:
Expand Down Expand Up @@ -545,8 +542,6 @@ muzzle-dep-report:
KUBERNETES_MEMORY_REQUEST: 20Gi
KUBERNETES_MEMORY_LIMIT: 20Gi
KUBERNETES_CPU_REQUEST: 10
GRADLE_WORKERS: 4
GRADLE_MEM: 3G
GRADLE_PARAMS: "-PskipFlakyTests"
CONTINUE_ON_FAILURE: "false"
TESTCONTAINERS_CHECKS_DISABLE: "true"
Expand All @@ -568,7 +563,8 @@ muzzle-dep-report:
export PROFILER_COMMAND="-XX:StartFlightRecording=settings=profile,filename=/tmp/${CI_JOB_NAME_SLUG}.jfr,dumponexit=true";
fi
- *prepare_test_env
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=1024M -Ddatadog.forkedMinHeapSize=128M"
- export GRADLE_OPTS="-Ddatadog.forkedMinHeapSize=128M -Ddatadog.forkedMaxHeapSize=1024M -Dorg.gradle.jvmargs='-XX:MaxRAMPercentage=$GRADLE_MEM_PERCENTAGE $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
- echo "GRADLE_OPTS_DBG4: ${GRADLE_OPTS}"
- ./gradlew --version
- ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS --continue || $CONTINUE_ON_FAILURE
after_script:
Expand Down