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
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ variables:
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
BUILDER_IMAGE_REPO: "registry.ddbuild.io/images/mirror/dd-trace-java-docker-build" # images are pinned in images/mirror.lock.yaml in the ddoghq/images repo
BUILDER_IMAGE_VERSION_PREFIX: "ci-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "ci-" or "123_merge-")
# shortcut: tag republishing is not detected; use a content hash when CI builds the image.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

note: This is related to the task of building the build-image in this pipeline.

ORG_GRADLE_PROJECT_ciBuilderImage: "${BUILDER_IMAGE_REPO}:${BUILDER_IMAGE_VERSION_PREFIX}"
TEST_COUNTS_S3_BUCKET: "dd-trace-java-ci-test-reports"
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|tip)$/ # the latest "tip" version is 27
Expand Down
2 changes: 2 additions & 0 deletions dd-java-agent/agent-ci-visibility/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion

plugins {
// ShellCommandExecutorTest invokes the image's echo, cat and sleep commands.
id 'dd-trace-java.ci-builder-inputs'
id 'com.gradleup.shadow'
id 'org.jetbrains.kotlin.jvm'
id 'dd-trace-java.version-file'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
plugins {
// Tests load the native profiler selected for the image's libc variant.
id 'dd-trace-java.ci-builder-inputs'
id 'dd-trace-java.module.internal-library'
}

Expand Down
2 changes: 2 additions & 0 deletions dd-java-agent/cws-tls/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import org.apache.maven.model.License

plugins {
// CWS tests exercise JNA native memory and the image's native runtime.
id 'dd-trace-java.ci-builder-inputs'
id 'com.gradleup.shadow'
id 'dd-trace-java.version-file'
id 'dd-trace-java.module.product-subsystem'
Expand Down
3 changes: 3 additions & 0 deletions dd-smoke-tests/quarkus-native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import java.util.concurrent.Callable
import java.util.regex.Pattern

plugins {
// Native smoke builds use GraalVM and native tools from the builder environment.
id 'dd-trace-java.ci-builder-inputs'
id 'dd-trace-java.smoke-test-app'
id 'dd-trace-java.module.smoke-test'
}
Expand Down Expand Up @@ -46,6 +48,7 @@ smokeTestApp {
environment.put('GRAALVM_HOME', graalvmHome)
inputs {
property('graalvmRelease', fileContent(graalvmHome, 'release'))
property('ciBuilderIdentity', ciBuilderInputs.identity)
}
}
projectJar('apiJar', project(':dd-trace-api'))
Expand Down
3 changes: 3 additions & 0 deletions dd-smoke-tests/spring-boot-3.0-native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import java.util.concurrent.Callable
import java.util.regex.Pattern

plugins {
// Native smoke builds use GraalVM and native tools from the builder environment.
id 'dd-trace-java.ci-builder-inputs'
id 'dd-trace-java.smoke-test-app'
id 'dd-trace-java.module.smoke-test'
}
Expand Down Expand Up @@ -44,6 +46,7 @@ smokeTestApp {
environment.put('NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION', 'true')
inputs {
property('graalvmRelease', fileContent(graalvmHome, 'release'))
property('ciBuilderIdentity', ciBuilderInputs.identity)
}
}
projectJar('apiJar', project(':dd-trace-api'))
Expand Down
2 changes: 2 additions & 0 deletions utils/container-utils/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
plugins {
// ContainerInfoTest invokes the image's ls -id command.
id("dd-trace-java.ci-builder-inputs")
`java-library`
id("dd-trace-java.module.internal-library")
}
Expand Down
2 changes: 2 additions & 0 deletions utils/test-utils/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
plugins {
// PortableCommandTest invokes the image's echo, cat, sleep and tail commands.
id("dd-trace-java.ci-builder-inputs")
`java-library`
id("dd-trace-java.module.internal-library")
}
Expand Down
Loading