Skip to content

Commit 695b02c

Browse files
authored
Change "stable" image name to "tip" (#10682)
Change stable image name to tip Move testing changes to a different PR Revert test branch change Merge branch 'master' into sarahchen6/change-stable-name Merge branch 'master' into sarahchen6/change-stable-name Co-authored-by: sarah.chen <sarah.chen@datadoghq.com>
1 parent 36af96f commit 695b02c

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
3232
BUILDER_IMAGE_VERSION_PREFIX: "v26.02-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
3333
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
34-
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|stable)$/ # the latest "stable" version is 26
34+
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|tip)$/ # the latest "tip" version is 26
3535
PROFILE_TESTS:
3636
description: "Enable profiling of tests"
3737
value: "false"
@@ -69,7 +69,7 @@ workflow:
6969
- "ibm8"
7070
- "zulu11"
7171
- "semeru17"
72-
- "stable"
72+
- "tip"
7373
CI_SPLIT: ["1/1"]
7474

7575
# Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
@@ -696,7 +696,7 @@ test_inst_latest:
696696
CACHE_TYPE: "latestdep"
697697
parallel:
698698
matrix:
699-
- testJvm: ["8", "17", "21", "25"] # the latest "stable" version is LTS v25
699+
- testJvm: ["8", "17", "21", "25"] # the latest "tip" version is LTS v25
700700
# Gitlab doesn't support "parallel" and "parallel:matrix" at the same time
701701
# This emulates "parallel" by including it in the matrix
702702
CI_SPLIT: [ "1/6", "2/6", "3/6", "4/6", "5/6", "6/6"]
@@ -748,7 +748,7 @@ test_debugger:
748748
variables:
749749
GRADLE_TARGET: ":debuggerTest"
750750
CACHE_TYPE: "base"
751-
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|semeru8)$/ # the latest "stable" version is LTS v25
751+
DEFAULT_TEST_JVMS: /^(8|11|17|21|25|semeru8)$/ # the latest "tip" version is LTS v25
752752
parallel:
753753
matrix: *test_matrix
754754

buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmSpec.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,15 @@ class TestJvmSpec(val project: Project) {
4646
val testJvmProperty: Provider<String> = project.providers.gradleProperty(TEST_JVM)
4747

4848
/**
49-
* Normalized `stable` string to the highest JAVA_X_HOME found in environment variables.
49+
* Normalized `tip` string that's set to the highest JAVA_X_HOME version found in environment variables.
5050
*/
5151
val normalizedTestJvm: Provider<String> = testJvmProperty.map { testJvm ->
5252
if (testJvm.isBlank()) {
5353
throw GradleException("testJvm property is blank")
5454
}
5555

56-
// "stable" is calculated as the largest Java version found via toolchains or JAVA_X_HOME
5756
when (testJvm) {
58-
"stable" -> {
57+
"tip" -> {
5958
val javaVersions = discoverJavaVersionsViaToolchains()
6059
?: discoverJavaVersionsViaEnvVars()
6160

0 commit comments

Comments
 (0)