Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,11 @@ muzzle-dep-report:
# Apache Maven Wrapper supports MVNW_REPOURL for repository-manager downloads:
# https://maven.apache.org/tools/wrapper/#Using_a_Maven_Repository_Manager
- export MVNW_REPOURL=${MAVEN_REPOSITORY_PROXY%/}
# Route Gradle distribution download through MASS pull-through cache
- |
mass_read_host="${MASS_READ_URL#https://}"
mass_read_host="${mass_read_host%/}"
sed -i "/^distributionUrl=/ s|services.gradle.org|${mass_read_host}/internal/artifact/services.gradle.org|" gradle/wrapper/gradle-wrapper.properties
- *normalize_node_index
- *prepare_test_env
# Disable CDS in forked JVMs to avoid SIGSEGVs on Linux arm64.
Expand Down Expand Up @@ -1110,6 +1115,7 @@ test_smoke_graalvm:
needs: *needs_build_tests_smoke
tags: [ "arch:amd64" ]
variables:
<<: *tier_l_variables

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: @PerfectSlayer the tier L variables are defined here

.tier_l:
variables: &tier_l_variables
GRADLE_WORKERS: 6
GRADLE_MEMORY_MIN: 1G
GRADLE_MEMORY_MAX: 6G
KUBERNETES_CPU_REQUEST: 10
KUBERNETES_MEMORY_REQUEST: 20Gi
KUBERNETES_MEMORY_LIMIT: 20Gi

GRADLE_TARGET: "stageMainDist :dd-smoke-test:spring-boot-3.0-native:test :dd-smoke-test:quarkus-native:test"
CACHE_TYPE: "smoke"
CI_NO_SPLIT: "true"
Expand All @@ -1122,6 +1128,7 @@ test_smoke_graalvm_arm64:
extends: .test_job_arm64
tags: [ "arch:arm64" ]
variables:
<<: *tier_l_variables
GRADLE_TARGET: "stageMainDist :dd-smoke-test:spring-boot-3.0-native:test :dd-smoke-test:quarkus-native:test"
CACHE_TYPE: "smoke"
CI_NO_SPLIT: "true"
Expand Down
22 changes: 15 additions & 7 deletions dd-smoke-tests/quarkus-native/application/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ if (hasProperty('appBuildDir')) {

version = ""

// Avoid unlimited CPU usage on CI.
def isCI = providers.environmentVariable("CI").isPresent()
def ciBuildCpuCount = providers.environmentVariable("KUBERNETES_CPU_REQUEST").getOrElse("4")

dependencies {
implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
implementation 'io.quarkus:quarkus-resteasy'
Expand All @@ -36,11 +40,15 @@ if (hasProperty('agentJar')) {
// are not properly tracked by this nested gradle build cache, it needs to be tracked
// from the outside (see smokeTestApp).
final agentJar = property('agentJar')
System.setProperty(
'quarkus.native.additional-build-args',
"-J-javaagent:${agentJar}," +
"-J-Ddatadog.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd'T'HH:mm:ss.SSS'Z [dd.trace]'," +
"-J-Ddd.profiling.enabled=true," +
"-march=native"
)
def nativeBuildArgs = [
"-J-javaagent:${agentJar}",
"-J-Ddatadog.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd'T'HH:mm:ss.SSS'Z [dd.trace]'",
"-J-Ddd.profiling.enabled=true",
"-march=native",
]
if (isCI) {
nativeBuildArgs.add("-H:NumberOfThreads=$ciBuildCpuCount")
nativeBuildArgs.add("-J-XX:ActiveProcessorCount=$ciBuildCpuCount")
}
System.setProperty('quarkus.native.additional-build-args', nativeBuildArgs.join(','))
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
quarkus.log.level=INFO
quarkus.log.category."datadog.smoketest".level=DEBUG
quarkus.log.console.format=%d %-5p [%c] '%t' |MT|%X{dd.trace_id}|MS|%X{dd.span_id}|%m%e%n
quarkus.native.native-image-xmx=4g

Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ apply from: "$sharedConfigDirectory/repositories.gradle"

ext.withProfiler = hasProperty('profiler')

// Avoid unlimited CPU usage on CI.
def isCI = providers.environmentVariable("CI").isPresent()
def ciBuildCpuCount = providers.environmentVariable("KUBERNETES_CPU_REQUEST").getOrElse("4")

if (hasProperty('appBuildDir')) {
buildDir = property('appBuildDir')
}
Expand Down Expand Up @@ -47,6 +51,10 @@ if (hasProperty('agentPath')) {
buildArgs.add("-J-Ddd.profiling.scrub.enabled=true")
buildArgs.add("-J-Ddd.profiling.start-force-first=true")
}
if (isCI) {
buildArgs.add("-H:NumberOfThreads=$ciBuildCpuCount")
buildArgs.add("-J-XX:ActiveProcessorCount=$ciBuildCpuCount")
}
jvmArgs.add("-Xmx4096M")
}
}
Expand Down