diff --git a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy index e4a6db7a9c4..1a36eb4c081 100644 --- a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy +++ b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy @@ -98,7 +98,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest { where: gradleVersion | projectName | flakyTests | expectedOrder | eventsNumber - "5.1" | "test-succeed-junit-4-class-ordering" | [ + "7.6.4" | "test-succeed-junit-4-class-ordering" | [ test("datadog.smoke.TestSucceedB", "test_succeed"), test("datadog.smoke.TestSucceedB", "test_succeed_another"), test("datadog.smoke.TestSucceedA", "test_succeed") diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-4-class-ordering/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-4-class-ordering/build.gradleTest index ed7646e3a4e..9229a31760f 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-4-class-ordering/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-4-class-ordering/build.gradleTest @@ -8,6 +8,7 @@ repositories { println "Using proxy repository: $proxyUrl" maven { url = proxyUrl + allowInsecureProtocol = true } } diff --git a/dd-smoke-tests/maven/build.gradle b/dd-smoke-tests/maven/build.gradle index b7f34643e2f..f52288a7381 100644 --- a/dd-smoke-tests/maven/build.gradle +++ b/dd-smoke-tests/maven/build.gradle @@ -20,4 +20,9 @@ jar { tasks.withType(Test).configureEach { dependsOn "shadowJar" jvmArgs "-Ddatadog.smoketest.maven.jar.path=${tasks.shadowJar.archiveFile.get()}" + + if (project.hasProperty("mavenRepositoryProxy")) { + // propagate proxy URL to tests, to then propagate it to nested Gradle builds + environment "MAVEN_REPOSITORY_PROXY", project.property("mavenRepositoryProxy") + } } 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 927f1ce0440..55ba62de287 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 @@ -348,6 +348,7 @@ 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()]) command.addAll(mvnCommand) ProcessBuilder processBuilder = new ProcessBuilder(command) @@ -358,6 +359,11 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { processBuilder.environment().put(envVar.key, envVar.value) } + def mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY") + if (mavenRepositoryProxy != null) { + processBuilder.environment().put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy) + } + return processBuilder } @@ -370,6 +376,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { def arguments = [ "-D${MavenWrapperMain.MVNW_VERBOSE}=true".toString(), "-Duser.dir=${projectHome.toAbsolutePath()}".toString(), + "-Dmaven.mainClass=org.apache.maven.cli.MavenCli".toString(), "-Dmaven.multiModuleProjectDirectory=${projectHome.toAbsolutePath()}".toString(), ] if (runWithAgent) { 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/settings.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100644 index 00000000000..3bd33609c99 --- /dev/null +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/settings.xml @@ -0,0 +1,39 @@ + + + + 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} + + + + + +