From 6be21d4c4e40a19ea157099bb485db74ba38cf07 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 10 Aug 2026 14:36:55 -0400 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=8D=92=20=20test=20cherry=20commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dd-smoke-tests/gradle/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle index 76ebc34b6cb..f9ed3628cb1 100644 --- a/dd-smoke-tests/gradle/build.gradle +++ b/dd-smoke-tests/gradle/build.gradle @@ -16,6 +16,7 @@ dependencies { } tasks.named("test", Test) { + // TODO: remove before merging. Adding change here to trigger tests. testLogging { events "passed", "skipped", "failed", "standardOut", "standardError" } From 2ceeb086ab4f803e73d2f5bbbd3c248c308153cb Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 10 Aug 2026 15:41:07 -0400 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=8D=92=20test=20cherry=20commit=20wit?= =?UTF-8?q?h=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dd-smoke-tests/gradle/build.gradle | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle index f9ed3628cb1..997e37c9677 100644 --- a/dd-smoke-tests/gradle/build.gradle +++ b/dd-smoke-tests/gradle/build.gradle @@ -16,7 +16,14 @@ dependencies { } tasks.named("test", Test) { - // TODO: remove before merging. Adding change here to trigger tests. + // Gradle 4.10.3's native-platform crashes on Linux when restoring non-ASCII environment values, so remove all non-ASCII chars. + ["CI_COMMIT_TITLE", "CI_COMMIT_MESSAGE", "CI_COMMIT_DESCRIPTION"].each { name -> + String value = environment[name] + if (value != null) { + environment[name] = value.replaceAll("[^\\p{ASCII}]", "") + } + } + testLogging { events "passed", "skipped", "failed", "standardOut", "standardError" } From 344b86a67dba4dcdd8c5e68bd25a555750e65022 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 11 Aug 2026 11:25:07 -0400 Subject: [PATCH 3/5] Try removing all CI_* vars in tests --- dd-smoke-tests/gradle/build.gradle | 12 ++++++------ .../datadog/smoketest/GradleDaemonSmokeTest.java | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle index 997e37c9677..2534a982803 100644 --- a/dd-smoke-tests/gradle/build.gradle +++ b/dd-smoke-tests/gradle/build.gradle @@ -17,12 +17,12 @@ dependencies { tasks.named("test", Test) { // Gradle 4.10.3's native-platform crashes on Linux when restoring non-ASCII environment values, so remove all non-ASCII chars. - ["CI_COMMIT_TITLE", "CI_COMMIT_MESSAGE", "CI_COMMIT_DESCRIPTION"].each { name -> - String value = environment[name] - if (value != null) { - environment[name] = value.replaceAll("[^\\p{ASCII}]", "") - } - } + // ["CI_COMMIT_TITLE", "CI_COMMIT_MESSAGE", "CI_COMMIT_DESCRIPTION"].each { name -> + // String value = environment[name] + // if (value != null) { + // environment[name] = value.replaceAll("[^\\p{ASCII}]", "") + // } + // } testLogging { events "passed", "skipped", "failed", "standardOut", "standardError" diff --git a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java index 37cd8c8a99c..c466dee0b5e 100644 --- a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java +++ b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java @@ -417,7 +417,8 @@ private void ensureDependenciesDownloaded(String gradleVersion) { private BuildResult runGradle( String gradleVersion, List arguments, boolean successExpected) throws IOException { - Map buildEnv = new HashMap<>(); + Map buildEnv = new HashMap<>(System.getenv()); + buildEnv.keySet().removeIf(name -> name.startsWith("CI_")); buildEnv.put("GRADLE_ARGS", ""); buildEnv.put("GRADLE_OPTS", ""); buildEnv.put("GRADLE_USER_HOME", testKitFolder.toString()); From 4ba8e4606614e2e67106820a2d7bb564878813c9 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 11 Aug 2026 12:05:19 -0400 Subject: [PATCH 4/5] =?UTF-8?q?=20=F0=9F=8D=92=20Retrigger=20with=20cherry?= =?UTF-8?q?=20commit=20message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dd-smoke-tests/gradle/build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle index 2534a982803..76ebc34b6cb 100644 --- a/dd-smoke-tests/gradle/build.gradle +++ b/dd-smoke-tests/gradle/build.gradle @@ -16,14 +16,6 @@ dependencies { } tasks.named("test", Test) { - // Gradle 4.10.3's native-platform crashes on Linux when restoring non-ASCII environment values, so remove all non-ASCII chars. - // ["CI_COMMIT_TITLE", "CI_COMMIT_MESSAGE", "CI_COMMIT_DESCRIPTION"].each { name -> - // String value = environment[name] - // if (value != null) { - // environment[name] = value.replaceAll("[^\\p{ASCII}]", "") - // } - // } - testLogging { events "passed", "skipped", "failed", "standardOut", "standardError" } From 66dfc3a33dcdd7ef8fbec6ccac28a3eb02d46f85 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 11 Aug 2026 12:17:42 -0400 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=8D=92=20Re-add=20Test=20task=20chang?= =?UTF-8?q?es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dd-smoke-tests/gradle/build.gradle | 8 ++++++++ .../java/datadog/smoketest/GradleDaemonSmokeTest.java | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle index 76ebc34b6cb..997e37c9677 100644 --- a/dd-smoke-tests/gradle/build.gradle +++ b/dd-smoke-tests/gradle/build.gradle @@ -16,6 +16,14 @@ dependencies { } tasks.named("test", Test) { + // Gradle 4.10.3's native-platform crashes on Linux when restoring non-ASCII environment values, so remove all non-ASCII chars. + ["CI_COMMIT_TITLE", "CI_COMMIT_MESSAGE", "CI_COMMIT_DESCRIPTION"].each { name -> + String value = environment[name] + if (value != null) { + environment[name] = value.replaceAll("[^\\p{ASCII}]", "") + } + } + testLogging { events "passed", "skipped", "failed", "standardOut", "standardError" } diff --git a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java index c466dee0b5e..37cd8c8a99c 100644 --- a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java +++ b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java @@ -417,8 +417,7 @@ private void ensureDependenciesDownloaded(String gradleVersion) { private BuildResult runGradle( String gradleVersion, List arguments, boolean successExpected) throws IOException { - Map buildEnv = new HashMap<>(System.getenv()); - buildEnv.keySet().removeIf(name -> name.startsWith("CI_")); + Map buildEnv = new HashMap<>(); buildEnv.put("GRADLE_ARGS", ""); buildEnv.put("GRADLE_OPTS", ""); buildEnv.put("GRADLE_USER_HOME", testKitFolder.toString());