From 1e0e2357f274c7de32ab646af1d782214b1dac90 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Tue, 1 Jul 2025 11:24:06 -0400 Subject: [PATCH 01/21] see if the issue is with settings.xml. Also change update policy to `never` --- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- .../test_successful_maven_run/pom.xml | 37 ++++++++++++++++++- .../test_successful_maven_run/settings.xml | 4 +- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- .../settings.xml | 4 +- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- .../pom.xml | 36 ++++++++++++++++++ .../settings.xml | 4 +- .../pom.xml | 37 ++++++++++++++++++- .../settings.xml | 4 +- 29 files changed, 534 insertions(+), 43 deletions(-) diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml index 48f92df3632..8e5f9c71625 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml @@ -58,5 +58,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml index 1680265ee15..46daed0326a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml @@ -58,5 +58,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml index 48f92df3632..8e5f9c71625 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml @@ -58,5 +58,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml index 1680265ee15..46daed0326a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml @@ -58,5 +58,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml index 3f616315427..9823602ae1b 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml @@ -58,5 +58,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml index 54f90b7ee7d..bdb197710ef 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml @@ -62,5 +62,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml index 3ecda3ba7d3..1bd59195047 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml @@ -102,5 +102,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml index f9689fbdbfa..f41d0b66c27 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml @@ -61,5 +61,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml index 48f92df3632..8e5f9c71625 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml @@ -58,5 +58,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml index 00cf589209d..1ec256928b7 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml @@ -58,5 +58,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml index 48f92df3632..8e5f9c71625 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml @@ -58,5 +58,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml index 1680265ee15..46daed0326a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml @@ -58,5 +58,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml index a1438bbcd50..1de61bfa552 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml @@ -60,4 +60,40 @@ test + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml index e0b5c2d0fe0..362243b36e0 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml @@ -80,5 +80,40 @@ - + + + with-proxy + + + env.MAVEN_REPOSITORY_PROXY + + + + + env-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + true + never + + + true + never + + + + + + + never + + + false + + env-proxy-plugins + ${env.MAVEN_REPOSITORY_PROXY} + + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/settings.xml index 3bd33609c99..5c79184f550 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/settings.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/settings.xml @@ -13,11 +13,11 @@ ${env.MAVEN_REPOSITORY_PROXY} true - always + never true - always + never From a0d1cf370ad1cffcc16b6ff4db57a7548962c36d Mon Sep 17 00:00:00 2001 From: Santiago Mola Date: Tue, 1 Jul 2025 19:21:21 +0200 Subject: [PATCH 02/21] Disable skipping tests based on git changes --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cfd791338ba..47c9b66df6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,7 +121,8 @@ default: .gitlab_base_ref_params: &gitlab_base_ref_params - | - if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then + # FIXME: Disabled until we find a way to not hit GitHub API rate limit + if false && [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then export GIT_BASE_REF=$(.gitlab/find-gh-base-ref.sh) if [[ -n "$GIT_BASE_REF" ]]; then export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$GIT_BASE_REF" From 7f91252943517cbf10155022d0dc352f8e2dc2ab Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Tue, 1 Jul 2025 13:45:39 -0400 Subject: [PATCH 03/21] Give names to projects and print command --- .../test/groovy/datadog/smoketest/MavenSmokeTest.groovy | 8 +++++--- .../resources/test_failed_maven_run_flaky_retries/pom.xml | 2 +- .../src/test/resources/test_successful_maven_run/pom.xml | 2 +- .../test_successful_maven_run_builtin_coverage/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../test_successful_maven_run_multiple_forks/pom.xml | 2 +- .../test_successful_maven_run_surefire_3_0_0/pom.xml | 2 +- .../test_successful_maven_run_surefire_3_5_0/pom.xml | 2 +- .../test_successful_maven_run_test_management/pom.xml | 2 +- .../pom.xml | 2 +- .../test_successful_maven_run_with_cucumber/pom.xml | 2 +- .../pom.xml | 2 +- 15 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 79a3ad7f715..3aa4f10fe6f 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -293,7 +293,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { private void retryUntilSuccessfulOrNoAttemptsLeft(List mvnCommand, Map additionalEnvVars = [:]) { def processBuilder = createProcessBuilder(mvnCommand, false, false, [], additionalEnvVars) for (int attempt = 0; attempt < DEPENDENCIES_DOWNLOAD_RETRIES; attempt++) { - def exitCode = runProcess(processBuilder.start()) + def exitCode = runProcess(processBuilder) if (exitCode == 0) { return } @@ -306,10 +306,12 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF") - return runProcess(processBuilder.start()) + return runProcess(processBuilder) } - private static runProcess(Process p) { + private static runProcess(ProcessBuilder processBuilder) { + println "Starting: " + processBuilder.command().join(" ") + Process p = processBuilder.start() StreamConsumer errorGobbler = new StreamConsumer(p.getErrorStream(), "ERROR") StreamConsumer outputGobbler = new StreamConsumer(p.getInputStream(), "OUTPUT") outputGobbler.start() diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml index 8e5f9c71625..ff37ccc3bbf 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Failed Maven Run Flaky Retries 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml index 46daed0326a..d56639103fa 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Successful Maven Run 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml index 8e5f9c71625..4d2d9ca8b27 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Builtin Coverage 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml index 46daed0326a..9dc11cf357b 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Child Service Propagation 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml index 9823602ae1b..68b493d449f 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Junit4 Class Ordering 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml index bdb197710ef..c5ac3040d35 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Junit4 Class Ordering Parallel 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml index 1bd59195047..c806082b021 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Junit Platform Runner UTF-8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml index f41d0b66c27..595bd4329eb 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Multiple Forks 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml index 8e5f9c71625..7c6761980f8 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Surefire 3.0.0 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml index 1ec256928b7..f27d807751b 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Surefire 3.5.9 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml index 8e5f9c71625..2790c143ff1 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Test Management 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml index 46daed0326a..ce2a4e07bf0 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + Arg Line Property 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml index 1de61bfa552..7e35d52ed1b 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + With Cucumber 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml index 362243b36e0..8c3be434a96 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Maven Smoke Tests Project + JaCoCo and Argline 8 From 75a05240a422d7b3fe6c7aff3d21ee45a32c4931 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Tue, 1 Jul 2025 15:57:55 -0400 Subject: [PATCH 04/21] some more debug info --- .../src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 3aa4f10fe6f..bda2aa9f952 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -59,6 +59,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { def setup() { mockBackend.reset() + println "Starting test: ${getSpecificationContext().getCurrentIteration().getName()} from ${specificationContext.currentSpec.name}" } def "test #projectName, v#mavenVersion"() { @@ -311,6 +312,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { private static runProcess(ProcessBuilder processBuilder) { println "Starting: " + processBuilder.command().join(" ") + println "MVN_HOME: " + processBuilder.environment().get("MAVEN_USER_HOME") Process p = processBuilder.start() StreamConsumer errorGobbler = new StreamConsumer(p.getErrorStream(), "ERROR") StreamConsumer outputGobbler = new StreamConsumer(p.getInputStream(), "OUTPUT") From 0ab6985cc5afea22133346935334b8a434f3f5fe Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Tue, 1 Jul 2025 15:59:23 -0400 Subject: [PATCH 05/21] Revert "Give names to projects and print command" This reverts commit 7f91252943517cbf10155022d0dc352f8e2dc2ab. # Conflicts: # dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy --- .../test/resources/test_failed_maven_run_flaky_retries/pom.xml | 2 +- .../maven/src/test/resources/test_successful_maven_run/pom.xml | 2 +- .../test_successful_maven_run_builtin_coverage/pom.xml | 2 +- .../test_successful_maven_run_child_service_propagation/pom.xml | 2 +- .../test_successful_maven_run_junit4_class_ordering/pom.xml | 2 +- .../pom.xml | 2 +- .../test_successful_maven_run_junit_platform_runner/pom.xml | 2 +- .../resources/test_successful_maven_run_multiple_forks/pom.xml | 2 +- .../resources/test_successful_maven_run_surefire_3_0_0/pom.xml | 2 +- .../resources/test_successful_maven_run_surefire_3_5_0/pom.xml | 2 +- .../resources/test_successful_maven_run_test_management/pom.xml | 2 +- .../test_successful_maven_run_with_arg_line_property/pom.xml | 2 +- .../resources/test_successful_maven_run_with_cucumber/pom.xml | 2 +- .../test_successful_maven_run_with_jacoco_and_argline/pom.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml index ff37ccc3bbf..8e5f9c71625 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Failed Maven Run Flaky Retries + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml index d56639103fa..46daed0326a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Successful Maven Run + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml index 4d2d9ca8b27..8e5f9c71625 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Builtin Coverage + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml index 9dc11cf357b..46daed0326a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Child Service Propagation + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml index 68b493d449f..9823602ae1b 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Junit4 Class Ordering + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml index c5ac3040d35..bdb197710ef 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Junit4 Class Ordering Parallel + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml index c806082b021..1bd59195047 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Junit Platform Runner + Maven Smoke Tests Project UTF-8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml index 595bd4329eb..f41d0b66c27 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Multiple Forks + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml index 7c6761980f8..8e5f9c71625 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Surefire 3.0.0 + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml index f27d807751b..1ec256928b7 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Surefire 3.5.9 + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml index 2790c143ff1..8e5f9c71625 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Test Management + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml index ce2a4e07bf0..46daed0326a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - Arg Line Property + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml index 7e35d52ed1b..1de61bfa552 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - With Cucumber + Maven Smoke Tests Project 8 diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml index 8c3be434a96..362243b36e0 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml @@ -6,7 +6,7 @@ com.datadog.ci.test maven-smoke-test 1.0-SNAPSHOT - JaCoCo and Argline + Maven Smoke Tests Project 8 From dac88424f6d83772841f4042e67ac89554a2ffef Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Tue, 1 Jul 2025 16:48:32 -0400 Subject: [PATCH 06/21] more debug --- .../src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index bda2aa9f952..96ff527f26e 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -59,10 +59,10 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { def setup() { mockBackend.reset() - println "Starting test: ${getSpecificationContext().getCurrentIteration().getName()} from ${specificationContext.currentSpec.name}" } def "test #projectName, v#mavenVersion"() { + println "Starting: ${projectName} ${mavenVersion}" Assumptions.assumeTrue(Jvm.current.isJavaVersionCompatible(minSupportedJavaVersion), "Current JVM " + Jvm.current.javaVersion + " is not compatible with minimum required version " + minSupportedJavaVersion) @@ -350,6 +350,8 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { def mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY") if (mavenRepositoryProxy != null) { processBuilder.environment().put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy) + } else { + println "MAVEN_REPOSITORY_PROXY NOT SET FOR ${mvnCommand}" } return processBuilder From bc9561fdd6dee7d7a89bbb0099ab67b743a56c64 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Tue, 1 Jul 2025 20:19:20 -0400 Subject: [PATCH 07/21] more debug --- .../src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 96ff527f26e..593ac961fa7 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -303,7 +303,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { } private int whenRunningMavenBuild(List additionalAgentArgs, List additionalCommandLineParams, Map additionalEnvVars, boolean setServiceName = true) { - def processBuilder = createProcessBuilder(["-B", "test"] + additionalCommandLineParams, true, setServiceName, additionalAgentArgs, additionalEnvVars) + def processBuilder = createProcessBuilder(["-B", "-X", "help:active-profiles", "test"] + additionalCommandLineParams, true, setServiceName, additionalAgentArgs, additionalEnvVars) processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF") From cb36f4c648e050839d372e55fb9896aef76e0822 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 2 Jul 2025 09:39:43 -0400 Subject: [PATCH 08/21] set and create MAVEN_USER_HOME in base gradle job --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47c9b66df6d..5de70329e93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,6 +164,8 @@ default: - source .gitlab/gitlab-utils.sh - mkdir -p .gradle - export GRADLE_USER_HOME=$(pwd)/.gradle + - mkdir -p .m2 + - export MAVEN_USER_HOME=$(pwd)/.m2 - | # Don't put jvm args here as it will be picked up by child gradle processes used in tests cat << EOF > $GRADLE_USER_HOME/gradle.properties From 410ab2f0cc4ad04fd6626b9feb9b46f78104c919 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 2 Jul 2025 14:41:31 -0400 Subject: [PATCH 09/21] fix maven home --- .../src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 593ac961fa7..f8fc7905594 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -337,6 +337,12 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { command.addAll((String[]) ["-jar", mavenRunnerShadowJar]) command.addAll(programArguments()) command.addAll(["-s", "${projectHome.toAbsolutePath()}/settings.xml".toString()]) + + String m2 = System.getenv().get("MAVEN_USER_HOME") + if (m2 != null) { + command.add("-Dmaven.repo.local=${m2}".toString()) + } + command.addAll(mvnCommand) ProcessBuilder processBuilder = new ProcessBuilder(command) From bff3d82ce1935fdb49e71c57d1cfedc7f7b7c5b4 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 2 Jul 2025 17:05:56 -0400 Subject: [PATCH 10/21] Use mirror instead of repository --- .../datadog/smoketest/MavenSmokeTest.groovy | 12 ++++-- .../src/test/resources/settings.mirror.xml | 9 +++++ .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- .../test_successful_maven_run/pom.xml | 36 ----------------- .../test_successful_maven_run/settings.xml | 39 ------------------- .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- .../settings.xml | 39 ------------------- .../settings.xml | 39 ------------------- .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- .../pom.xml | 36 ----------------- .../settings.xml | 39 ------------------- 30 files changed, 18 insertions(+), 1056 deletions(-) create mode 100644 dd-smoke-tests/maven/src/test/resources/settings.mirror.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/settings.xml delete mode 100644 dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/settings.xml diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index f8fc7905594..0b3214c4f24 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -246,6 +246,9 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { def projectResourcesUri = this.getClass().getClassLoader().getResource(projectFilesSources).toURI() def projectResourcesPath = Paths.get(projectResourcesUri) copyFolder(projectResourcesPath, projectHome) + + def sharedSettingsPath = Paths.get(this.getClass().getClassLoader().getResource("settings.mirror.xml").toURI()) + Files.copy(sharedSettingsPath, projectHome.resolve("settings.mirror.xml")) } private void copyFolder(Path src, Path dest) throws IOException { @@ -303,7 +306,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { } private int whenRunningMavenBuild(List additionalAgentArgs, List additionalCommandLineParams, Map additionalEnvVars, boolean setServiceName = true) { - def processBuilder = createProcessBuilder(["-B", "-X", "help:active-profiles", "test"] + additionalCommandLineParams, true, setServiceName, additionalAgentArgs, additionalEnvVars) + def processBuilder = createProcessBuilder(["-B", "-X", "--offline", "test"] + additionalCommandLineParams, true, setServiceName, additionalAgentArgs, additionalEnvVars) processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF") @@ -336,13 +339,16 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { command.addAll(jvmArguments(runWithAgent, setServiceName, additionalAgentArgs)) command.addAll((String[]) ["-jar", mavenRunnerShadowJar]) command.addAll(programArguments()) - command.addAll(["-s", "${projectHome.toAbsolutePath()}/settings.xml".toString()]) + + if (System.getenv().get("MAVEN_REPOSITORY_PROXY") != null) { + command.addAll(["-s", "${projectHome.toAbsolutePath()}/settings.mirror.xml".toString()]) + } String m2 = System.getenv().get("MAVEN_USER_HOME") if (m2 != null) { command.add("-Dmaven.repo.local=${m2}".toString()) } - + command.addAll(mvnCommand) ProcessBuilder processBuilder = new ProcessBuilder(command) diff --git a/dd-smoke-tests/maven/src/test/resources/settings.mirror.xml b/dd-smoke-tests/maven/src/test/resources/settings.mirror.xml new file mode 100644 index 00000000000..7b663052386 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/settings.mirror.xml @@ -0,0 +1,9 @@ + + + + env-proxy + * + ${env.MAVEN_REPOSITORY_PROXY} + + + diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml index 8e5f9c71625..87b908e811a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml @@ -58,40 +58,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml index 46daed0326a..23e0a7cd20b 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml @@ -58,40 +58,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml index 8e5f9c71625..87b908e811a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml @@ -58,40 +58,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml index 46daed0326a..23e0a7cd20b 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml @@ -58,40 +58,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml index bdb197710ef..bc5a7e5a96d 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml @@ -62,40 +62,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml index 1bd59195047..9616a4ae9de 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml @@ -102,40 +102,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml index f41d0b66c27..bc56397cf34 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml @@ -61,40 +61,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml index 8e5f9c71625..87b908e811a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml @@ -58,40 +58,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml index 1ec256928b7..14ff6c1297d 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml @@ -58,40 +58,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml index 8e5f9c71625..87b908e811a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml @@ -58,40 +58,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml index 46daed0326a..23e0a7cd20b 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml @@ -58,40 +58,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml index 1de61bfa552..a1438bbcd50 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml @@ -60,40 +60,4 @@ test - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml index 362243b36e0..dfc429e2455 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml @@ -80,40 +80,4 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/settings.xml deleted file mode 100644 index 5c79184f550..00000000000 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - - From 29cda74c6ea2889250c69b75b4b28c32d4cae2e3 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 2 Jul 2025 17:56:44 -0400 Subject: [PATCH 11/21] offline mode doesn't work --- .../datadog/smoketest/MavenSmokeTest.groovy | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 0b3214c4f24..9bab16852c5 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -306,7 +306,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { } private int whenRunningMavenBuild(List additionalAgentArgs, List additionalCommandLineParams, Map additionalEnvVars, boolean setServiceName = true) { - def processBuilder = createProcessBuilder(["-B", "-X", "--offline", "test"] + additionalCommandLineParams, true, setServiceName, additionalAgentArgs, additionalEnvVars) + def processBuilder = createProcessBuilder(["-B", "-X", "test"] + additionalCommandLineParams, true, setServiceName, additionalAgentArgs, additionalEnvVars) processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF") @@ -314,8 +314,6 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { } private static runProcess(ProcessBuilder processBuilder) { - println "Starting: " + processBuilder.command().join(" ") - println "MVN_HOME: " + processBuilder.environment().get("MAVEN_USER_HOME") Process p = processBuilder.start() StreamConsumer errorGobbler = new StreamConsumer(p.getErrorStream(), "ERROR") StreamConsumer outputGobbler = new StreamConsumer(p.getInputStream(), "OUTPUT") @@ -343,12 +341,6 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { if (System.getenv().get("MAVEN_REPOSITORY_PROXY") != null) { command.addAll(["-s", "${projectHome.toAbsolutePath()}/settings.mirror.xml".toString()]) } - - String m2 = System.getenv().get("MAVEN_USER_HOME") - if (m2 != null) { - command.add("-Dmaven.repo.local=${m2}".toString()) - } - command.addAll(mvnCommand) ProcessBuilder processBuilder = new ProcessBuilder(command) @@ -381,6 +373,12 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { "-Dmaven.mainClass=org.apache.maven.cli.MavenCli".toString(), "-Dmaven.multiModuleProjectDirectory=${projectHome.toAbsolutePath()}".toString(), ] + + String m2 = System.getenv().get("MAVEN_USER_HOME") + if (m2 != null) { + arguments += "-Dmaven.repo.local=${m2}".toString() + } + if (runWithAgent) { if (System.getenv("DD_CIVISIBILITY_SMOKETEST_DEBUG_PARENT") != null) { // for convenience when debugging locally From f72d4ab1f6666c026d743f6b3c4246520746cfaf Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 2 Jul 2025 18:00:29 -0400 Subject: [PATCH 12/21] minimize the diff --- .../datadog/smoketest/MavenSmokeTest.groovy | 7 ++-- .../pom.xml | 1 + .../test_successful_maven_run/pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 37 +------------------ .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + .../pom.xml | 1 + 15 files changed, 17 insertions(+), 40 deletions(-) diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 9bab16852c5..a86c99688f6 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -297,7 +297,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { private void retryUntilSuccessfulOrNoAttemptsLeft(List mvnCommand, Map additionalEnvVars = [:]) { def processBuilder = createProcessBuilder(mvnCommand, false, false, [], additionalEnvVars) for (int attempt = 0; attempt < DEPENDENCIES_DOWNLOAD_RETRIES; attempt++) { - def exitCode = runProcess(processBuilder) + def exitCode = runProcess(processBuilder.start()) if (exitCode == 0) { return } @@ -310,11 +310,10 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF") - return runProcess(processBuilder) + return runProcess(processBuilder.start()) } - private static runProcess(ProcessBuilder processBuilder) { - Process p = processBuilder.start() + private static runProcess(Process p) { StreamConsumer errorGobbler = new StreamConsumer(p.getErrorStream(), "ERROR") StreamConsumer outputGobbler = new StreamConsumer(p.getInputStream(), "OUTPUT") outputGobbler.start() diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml index 87b908e811a..48f92df3632 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/pom.xml @@ -58,4 +58,5 @@ + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml index 23e0a7cd20b..1680265ee15 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/pom.xml @@ -58,4 +58,5 @@ + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml index 87b908e811a..48f92df3632 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/pom.xml @@ -58,4 +58,5 @@ + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml index 23e0a7cd20b..1680265ee15 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/pom.xml @@ -58,4 +58,5 @@ + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml index 9823602ae1b..3f616315427 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/pom.xml @@ -58,40 +58,5 @@ - - - with-proxy - - - env.MAVEN_REPOSITORY_PROXY - - - - - env-proxy - ${env.MAVEN_REPOSITORY_PROXY} - - true - never - - - true - never - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml index bc5a7e5a96d..54f90b7ee7d 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml @@ -62,4 +62,5 @@ + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml index 9616a4ae9de..3ecda3ba7d3 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml @@ -102,4 +102,5 @@ + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml index bc56397cf34..f9689fbdbfa 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/pom.xml @@ -61,4 +61,5 @@ + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml index 87b908e811a..48f92df3632 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/pom.xml @@ -58,4 +58,5 @@ + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml index 14ff6c1297d..00cf589209d 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/pom.xml @@ -58,4 +58,5 @@ + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml index 87b908e811a..48f92df3632 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/pom.xml @@ -58,4 +58,5 @@ + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml index 23e0a7cd20b..1680265ee15 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/pom.xml @@ -58,4 +58,5 @@ + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml index a1438bbcd50..a01b257ca20 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml @@ -60,4 +60,5 @@ test + diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml index dfc429e2455..e0b5c2d0fe0 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/pom.xml @@ -80,4 +80,5 @@ + From 02945a247a50705afcd11b1f650ee90aee0fb2a4 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 2 Jul 2025 19:10:55 -0400 Subject: [PATCH 13/21] remove debug and m2 folder changes --- .gitlab-ci.yml | 2 -- .../test/groovy/datadog/smoketest/MavenSmokeTest.groovy | 7 +------ .../test_successful_maven_run_with_cucumber/pom.xml | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5de70329e93..47c9b66df6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,8 +164,6 @@ default: - source .gitlab/gitlab-utils.sh - mkdir -p .gradle - export GRADLE_USER_HOME=$(pwd)/.gradle - - mkdir -p .m2 - - export MAVEN_USER_HOME=$(pwd)/.m2 - | # Don't put jvm args here as it will be picked up by child gradle processes used in tests cat << EOF > $GRADLE_USER_HOME/gradle.properties diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index b8aa4d750d1..369b8a92b9f 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -306,7 +306,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { } private int whenRunningMavenBuild(List additionalAgentArgs, List additionalCommandLineParams, Map additionalEnvVars, boolean setServiceName = true) { - def processBuilder = createProcessBuilder(["-B", "-X", "test"] + additionalCommandLineParams, true, setServiceName, additionalAgentArgs, additionalEnvVars) + def processBuilder = createProcessBuilder(["-B", "test"] + additionalCommandLineParams, true, setServiceName, additionalAgentArgs, additionalEnvVars) processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF") @@ -371,11 +371,6 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { "-Dmaven.multiModuleProjectDirectory=${projectHome.toAbsolutePath()}".toString(), ] - String m2 = System.getenv().get("MAVEN_USER_HOME") - if (m2 != null) { - arguments += "-Dmaven.repo.local=${m2}".toString() - } - if (runWithAgent) { if (System.getenv("DD_CIVISIBILITY_SMOKETEST_DEBUG_PARENT") != null) { // for convenience when debugging locally diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml index a01b257ca20..a1438bbcd50 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/pom.xml @@ -60,5 +60,4 @@ test - From 30b1769db04f5f6233eab88ab2d4dd20c2f8c4f8 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 2 Jul 2025 19:46:32 -0400 Subject: [PATCH 14/21] Revert "remove debug and m2 folder changes" This reverts commit 02945a247a50705afcd11b1f650ee90aee0fb2a4. --- .gitlab-ci.yml | 2 ++ .../src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47c9b66df6d..5de70329e93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,6 +164,8 @@ default: - source .gitlab/gitlab-utils.sh - mkdir -p .gradle - export GRADLE_USER_HOME=$(pwd)/.gradle + - mkdir -p .m2 + - export MAVEN_USER_HOME=$(pwd)/.m2 - | # Don't put jvm args here as it will be picked up by child gradle processes used in tests cat << EOF > $GRADLE_USER_HOME/gradle.properties diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 369b8a92b9f..8a81ed0f3fa 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -371,6 +371,11 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { "-Dmaven.multiModuleProjectDirectory=${projectHome.toAbsolutePath()}".toString(), ] + String m2 = System.getenv().get("MAVEN_USER_HOME") + if (m2 != null) { + arguments += "-Dmaven.repo.local=${m2}".toString() + } + if (runWithAgent) { if (System.getenv("DD_CIVISIBILITY_SMOKETEST_DEBUG_PARENT") != null) { // for convenience when debugging locally From 9ad2380be92398bc213a10e1c72f9aacb208aab4 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 2 Jul 2025 19:47:34 -0400 Subject: [PATCH 15/21] undo merged fix --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5de70329e93..3291701090c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,8 +121,7 @@ default: .gitlab_base_ref_params: &gitlab_base_ref_params - | - # FIXME: Disabled until we find a way to not hit GitHub API rate limit - if false && [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then + if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then export GIT_BASE_REF=$(.gitlab/find-gh-base-ref.sh) if [[ -n "$GIT_BASE_REF" ]]; then export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$GIT_BASE_REF" From 50cb503432819aebb1a3ea8c68d0c844d2aa19ab Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 2 Jul 2025 19:59:23 -0400 Subject: [PATCH 16/21] Revert "undo merged fix" This reverts commit 9ad2380be92398bc213a10e1c72f9aacb208aab4. --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3291701090c..5de70329e93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,7 +121,8 @@ default: .gitlab_base_ref_params: &gitlab_base_ref_params - | - if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then + # FIXME: Disabled until we find a way to not hit GitHub API rate limit + if false && [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then export GIT_BASE_REF=$(.gitlab/find-gh-base-ref.sh) if [[ -n "$GIT_BASE_REF" ]]; then export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$GIT_BASE_REF" From b0ba26cbdcaa2a9111ed8f84a1b74631f2ef3128 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Thu, 3 Jul 2025 11:04:27 -0400 Subject: [PATCH 17/21] use "package" in addition to go-offline --- .../src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 8a81ed0f3fa..ba77e201224 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -279,7 +279,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { */ private void givenMavenDependenciesAreLoaded(String projectName, String mavenVersion, Map additionalEnvVars = [:]) { if (LOADED_DEPENDENCIES.add("$projectName:$mavenVersion")) { - retryUntilSuccessfulOrNoAttemptsLeft(["dependency:go-offline"], additionalEnvVars) + retryUntilSuccessfulOrNoAttemptsLeft(["dependencies:go-offline", "package"], additionalEnvVars) } // dependencies below are download separately // because they are not declared in the project, From 4ad5d314e717c5f39d9ca307d007146d22e2d9e2 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Thu, 3 Jul 2025 11:43:44 -0400 Subject: [PATCH 18/21] fix error, only run some tests --- .gitlab-ci.yml | 2 +- .../datadog/smoketest/MavenSmokeTest.groovy | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5de70329e93..fc8e18a5fc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -637,7 +637,7 @@ test_debugger: test_smoke: extends: .test_job variables: - GRADLE_TARGET: "stageMainDist :smokeTest" + GRADLE_TARGET: "stageMainDist :dd-smoke-tests:maven:test" GRADLE_PARAMS: "-PskipFlakyTests" CACHE_TYPE: "smoke" parallel: diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index ba77e201224..7d9be23a55d 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -98,19 +98,19 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { "test_successful_maven_run" | "3.6.3" | 5 | 1 | true | true | false | true | [] | 8 "test_successful_maven_run" | "3.8.8" | 5 | 1 | true | true | false | true | [] | 8 "test_successful_maven_run" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 - "test_successful_maven_run_surefire_3_0_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 - "test_successful_maven_run_surefire_3_0_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 - "test_successful_maven_run_surefire_3_5_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 - "test_successful_maven_run_surefire_3_5_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 - "test_successful_maven_run_builtin_coverage" | "3.9.9" | 5 | 1 | true | true | false | false | [] | 8 - "test_successful_maven_run_with_jacoco_and_argline" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 - // "expectedEvents" count for this test case does not include the spans that correspond to Cucumber steps - "test_successful_maven_run_with_cucumber" | "3.9.9" | 4 | 1 | true | false | false | true | [] | 8 - "test_failed_maven_run_flaky_retries" | "3.9.9" | 8 | 5 | false | false | true | true | [] | 8 - "test_successful_maven_run_junit_platform_runner" | "3.9.9" | 4 | 0 | true | false | false | false | [] | 8 - "test_successful_maven_run_with_arg_line_property" | "3.9.9" | 4 | 0 | true | false | false | false | ["-DargLine='-Dmy-custom-property=provided-via-command-line'"] | 8 - "test_successful_maven_run_multiple_forks" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 - "test_successful_maven_run_multiple_forks" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 +// "test_successful_maven_run_surefire_3_0_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 +// "test_successful_maven_run_surefire_3_0_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 +// "test_successful_maven_run_surefire_3_5_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 +// "test_successful_maven_run_surefire_3_5_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 +// "test_successful_maven_run_builtin_coverage" | "3.9.9" | 5 | 1 | true | true | false | false | [] | 8 +// "test_successful_maven_run_with_jacoco_and_argline" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 +// // "expectedEvents" count for this test case does not include the spans that correspond to Cucumber steps +// "test_successful_maven_run_with_cucumber" | "3.9.9" | 4 | 1 | true | false | false | true | [] | 8 +// "test_failed_maven_run_flaky_retries" | "3.9.9" | 8 | 5 | false | false | true | true | [] | 8 +// "test_successful_maven_run_junit_platform_runner" | "3.9.9" | 4 | 0 | true | false | false | false | [] | 8 +// "test_successful_maven_run_with_arg_line_property" | "3.9.9" | 4 | 0 | true | false | false | false | ["-DargLine='-Dmy-custom-property=provided-via-command-line'"] | 8 +// "test_successful_maven_run_multiple_forks" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 +// "test_successful_maven_run_multiple_forks" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 } def "test test management"() { @@ -279,7 +279,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { */ private void givenMavenDependenciesAreLoaded(String projectName, String mavenVersion, Map additionalEnvVars = [:]) { if (LOADED_DEPENDENCIES.add("$projectName:$mavenVersion")) { - retryUntilSuccessfulOrNoAttemptsLeft(["dependencies:go-offline", "package"], additionalEnvVars) + retryUntilSuccessfulOrNoAttemptsLeft(["dependency:go-offline", "package"], additionalEnvVars) } // dependencies below are download separately // because they are not declared in the project, From 0158a96e7788f22bc9d7953492c42b9b731d8cb8 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Thu, 3 Jul 2025 14:35:30 -0400 Subject: [PATCH 19/21] remove "package" because it's too slow --- .../src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 7d9be23a55d..2a6615ee6bb 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -279,7 +279,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { */ private void givenMavenDependenciesAreLoaded(String projectName, String mavenVersion, Map additionalEnvVars = [:]) { if (LOADED_DEPENDENCIES.add("$projectName:$mavenVersion")) { - retryUntilSuccessfulOrNoAttemptsLeft(["dependency:go-offline", "package"], additionalEnvVars) + retryUntilSuccessfulOrNoAttemptsLeft(["dependency:go-offline"], additionalEnvVars) } // dependencies below are download separately // because they are not declared in the project, From 6f44553d6aa5dfc7d2d8985fcfb55d8d0afd8453 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Thu, 3 Jul 2025 14:36:14 -0400 Subject: [PATCH 20/21] Reapply "remove debug and m2 folder changes" This reverts commit 30b1769db04f5f6233eab88ab2d4dd20c2f8c4f8. --- .gitlab-ci.yml | 2 -- .../src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy | 5 ----- 2 files changed, 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc8e18a5fc3..03036568208 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,8 +164,6 @@ default: - source .gitlab/gitlab-utils.sh - mkdir -p .gradle - export GRADLE_USER_HOME=$(pwd)/.gradle - - mkdir -p .m2 - - export MAVEN_USER_HOME=$(pwd)/.m2 - | # Don't put jvm args here as it will be picked up by child gradle processes used in tests cat << EOF > $GRADLE_USER_HOME/gradle.properties diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 2a6615ee6bb..594e96842a3 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -371,11 +371,6 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { "-Dmaven.multiModuleProjectDirectory=${projectHome.toAbsolutePath()}".toString(), ] - String m2 = System.getenv().get("MAVEN_USER_HOME") - if (m2 != null) { - arguments += "-Dmaven.repo.local=${m2}".toString() - } - if (runWithAgent) { if (System.getenv("DD_CIVISIBILITY_SMOKETEST_DEBUG_PARENT") != null) { // for convenience when debugging locally From d0b8bb8ed66d22ff5cbf0824f317c2287c5893e6 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Thu, 3 Jul 2025 17:15:34 -0400 Subject: [PATCH 21/21] Cleanup for PR --- .gitlab-ci.yml | 2 +- .../datadog/smoketest/MavenSmokeTest.groovy | 27 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03036568208..47c9b66df6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -635,7 +635,7 @@ test_debugger: test_smoke: extends: .test_job variables: - GRADLE_TARGET: "stageMainDist :dd-smoke-tests:maven:test" + GRADLE_TARGET: "stageMainDist :smokeTest" GRADLE_PARAMS: "-PskipFlakyTests" CACHE_TYPE: "smoke" parallel: diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 594e96842a3..09a6562621b 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -98,19 +98,19 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { "test_successful_maven_run" | "3.6.3" | 5 | 1 | true | true | false | true | [] | 8 "test_successful_maven_run" | "3.8.8" | 5 | 1 | true | true | false | true | [] | 8 "test_successful_maven_run" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 -// "test_successful_maven_run_surefire_3_0_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 -// "test_successful_maven_run_surefire_3_0_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 -// "test_successful_maven_run_surefire_3_5_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 -// "test_successful_maven_run_surefire_3_5_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 -// "test_successful_maven_run_builtin_coverage" | "3.9.9" | 5 | 1 | true | true | false | false | [] | 8 -// "test_successful_maven_run_with_jacoco_and_argline" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 -// // "expectedEvents" count for this test case does not include the spans that correspond to Cucumber steps -// "test_successful_maven_run_with_cucumber" | "3.9.9" | 4 | 1 | true | false | false | true | [] | 8 -// "test_failed_maven_run_flaky_retries" | "3.9.9" | 8 | 5 | false | false | true | true | [] | 8 -// "test_successful_maven_run_junit_platform_runner" | "3.9.9" | 4 | 0 | true | false | false | false | [] | 8 -// "test_successful_maven_run_with_arg_line_property" | "3.9.9" | 4 | 0 | true | false | false | false | ["-DargLine='-Dmy-custom-property=provided-via-command-line'"] | 8 -// "test_successful_maven_run_multiple_forks" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 -// "test_successful_maven_run_multiple_forks" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 + "test_successful_maven_run_surefire_3_0_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 + "test_successful_maven_run_surefire_3_0_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 + "test_successful_maven_run_surefire_3_5_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 + "test_successful_maven_run_surefire_3_5_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 + "test_successful_maven_run_builtin_coverage" | "3.9.9" | 5 | 1 | true | true | false | false | [] | 8 + "test_successful_maven_run_with_jacoco_and_argline" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 + // "expectedEvents" count for this test case does not include the spans that correspond to Cucumber steps + "test_successful_maven_run_with_cucumber" | "3.9.9" | 4 | 1 | true | false | false | true | [] | 8 + "test_failed_maven_run_flaky_retries" | "3.9.9" | 8 | 5 | false | false | true | true | [] | 8 + "test_successful_maven_run_junit_platform_runner" | "3.9.9" | 4 | 0 | true | false | false | false | [] | 8 + "test_successful_maven_run_with_arg_line_property" | "3.9.9" | 4 | 0 | true | false | false | false | ["-DargLine='-Dmy-custom-property=provided-via-command-line'"] | 8 + "test_successful_maven_run_multiple_forks" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8 + "test_successful_maven_run_multiple_forks" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17 } def "test test management"() { @@ -370,7 +370,6 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { "-Dmaven.mainClass=org.apache.maven.cli.MavenCli".toString(), "-Dmaven.multiModuleProjectDirectory=${projectHome.toAbsolutePath()}".toString(), ] - if (runWithAgent) { if (System.getenv("DD_CIVISIBILITY_SMOKETEST_DEBUG_PARENT") != null) { // for convenience when debugging locally