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..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 @@ -62,6 +62,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { } 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) @@ -245,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 { @@ -332,7 +336,10 @@ 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()]) + } 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/settings.xml b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml deleted file mode 100644 index 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - 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 3bd33609c99..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 - always - - - true - always - - - - - - - never - - - false - - env-proxy-plugins - ${env.MAVEN_REPOSITORY_PROXY} - - - - - -