Skip to content

Commit ff2b2e9

Browse files
nikita-tkachenko-datadognikita-tkachenko-datadog
authored
Update Maven smoke tests to use repository proxy (#8979)
1 parent 1150a82 commit ff2b2e9

File tree

19 files changed

+599
-1
lines changed

19 files changed

+599
-1
lines changed

‎dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
9898

9999
where:
100100
gradleVersion | projectName | flakyTests | expectedOrder | eventsNumber
101-
"5.1" | "test-succeed-junit-4-class-ordering" | [
101+
"7.6.4" | "test-succeed-junit-4-class-ordering" | [
102102
test("datadog.smoke.TestSucceedB", "test_succeed"),
103103
test("datadog.smoke.TestSucceedB", "test_succeed_another"),
104104
test("datadog.smoke.TestSucceedA", "test_succeed")

‎dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-4-class-ordering/build.gradleTest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ repositories {
88
println "Using proxy repository: $proxyUrl"
99
maven {
1010
url = proxyUrl
11+
allowInsecureProtocol = true
1112
}
1213
}
1314

‎dd-smoke-tests/maven/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,9 @@ jar {
2020
tasks.withType(Test).configureEach {
2121
dependsOn "shadowJar"
2222
jvmArgs "-Ddatadog.smoketest.maven.jar.path=${tasks.shadowJar.archiveFile.get()}"
23+
24+
if (project.hasProperty("mavenRepositoryProxy")) {
25+
// propagate proxy URL to tests, to then propagate it to nested Gradle builds
26+
environment "MAVEN_REPOSITORY_PROXY", project.property("mavenRepositoryProxy")
27+
}
2328
}

‎dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
348348
command.addAll(jvmArguments(runWithAgent, setServiceName, additionalAgentArgs))
349349
command.addAll((String[]) ["-jar", mavenRunnerShadowJar])
350350
command.addAll(programArguments())
351+
command.addAll(["-s", "${projectHome.toAbsolutePath()}/settings.xml".toString()])
351352
command.addAll(mvnCommand)
352353

353354
ProcessBuilder processBuilder = new ProcessBuilder(command)
@@ -358,6 +359,11 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
358359
processBuilder.environment().put(envVar.key, envVar.value)
359360
}
360361

362+
def mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY")
363+
if (mavenRepositoryProxy != null) {
364+
processBuilder.environment().put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy)
365+
}
366+
361367
return processBuilder
362368
}
363369

@@ -370,6 +376,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
370376
def arguments = [
371377
"-D${MavenWrapperMain.MVNW_VERBOSE}=true".toString(),
372378
"-Duser.dir=${projectHome.toAbsolutePath()}".toString(),
379+
"-Dmaven.mainClass=org.apache.maven.cli.MavenCli".toString(),
373380
"-Dmaven.multiModuleProjectDirectory=${projectHome.toAbsolutePath()}".toString(),
374381
]
375382
if (runWithAgent) {

‎dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/settings.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<settings>
2+
<profiles>
3+
<profile>
4+
<id>with-proxy</id>
5+
<activation>
6+
<property>
7+
<name>env.MAVEN_REPOSITORY_PROXY</name>
8+
</property>
9+
</activation>
10+
<repositories>
11+
<repository>
12+
<id>env-proxy</id>
13+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
14+
<releases>
15+
<enabled>true</enabled>
16+
<updatePolicy>always</updatePolicy>
17+
</releases>
18+
<snapshots>
19+
<enabled>true</enabled>
20+
<updatePolicy>always</updatePolicy>
21+
</snapshots>
22+
</repository>
23+
</repositories>
24+
<pluginRepositories>
25+
<pluginRepository>
26+
<releases>
27+
<updatePolicy>never</updatePolicy>
28+
</releases>
29+
<snapshots>
30+
<enabled>false</enabled>
31+
</snapshots>
32+
<id>env-proxy-plugins</id>
33+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
</profile>
37+
</profiles>
38+
39+
</settings>

‎dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/settings.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<settings>
2+
<profiles>
3+
<profile>
4+
<id>with-proxy</id>
5+
<activation>
6+
<property>
7+
<name>env.MAVEN_REPOSITORY_PROXY</name>
8+
</property>
9+
</activation>
10+
<repositories>
11+
<repository>
12+
<id>env-proxy</id>
13+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
14+
<releases>
15+
<enabled>true</enabled>
16+
<updatePolicy>always</updatePolicy>
17+
</releases>
18+
<snapshots>
19+
<enabled>true</enabled>
20+
<updatePolicy>always</updatePolicy>
21+
</snapshots>
22+
</repository>
23+
</repositories>
24+
<pluginRepositories>
25+
<pluginRepository>
26+
<releases>
27+
<updatePolicy>never</updatePolicy>
28+
</releases>
29+
<snapshots>
30+
<enabled>false</enabled>
31+
</snapshots>
32+
<id>env-proxy-plugins</id>
33+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
</profile>
37+
</profiles>
38+
39+
</settings>

‎dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/settings.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<settings>
2+
<profiles>
3+
<profile>
4+
<id>with-proxy</id>
5+
<activation>
6+
<property>
7+
<name>env.MAVEN_REPOSITORY_PROXY</name>
8+
</property>
9+
</activation>
10+
<repositories>
11+
<repository>
12+
<id>env-proxy</id>
13+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
14+
<releases>
15+
<enabled>true</enabled>
16+
<updatePolicy>always</updatePolicy>
17+
</releases>
18+
<snapshots>
19+
<enabled>true</enabled>
20+
<updatePolicy>always</updatePolicy>
21+
</snapshots>
22+
</repository>
23+
</repositories>
24+
<pluginRepositories>
25+
<pluginRepository>
26+
<releases>
27+
<updatePolicy>never</updatePolicy>
28+
</releases>
29+
<snapshots>
30+
<enabled>false</enabled>
31+
</snapshots>
32+
<id>env-proxy-plugins</id>
33+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
</profile>
37+
</profiles>
38+
39+
</settings>

‎dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_child_service_propagation/settings.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<settings>
2+
<profiles>
3+
<profile>
4+
<id>with-proxy</id>
5+
<activation>
6+
<property>
7+
<name>env.MAVEN_REPOSITORY_PROXY</name>
8+
</property>
9+
</activation>
10+
<repositories>
11+
<repository>
12+
<id>env-proxy</id>
13+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
14+
<releases>
15+
<enabled>true</enabled>
16+
<updatePolicy>always</updatePolicy>
17+
</releases>
18+
<snapshots>
19+
<enabled>true</enabled>
20+
<updatePolicy>always</updatePolicy>
21+
</snapshots>
22+
</repository>
23+
</repositories>
24+
<pluginRepositories>
25+
<pluginRepository>
26+
<releases>
27+
<updatePolicy>never</updatePolicy>
28+
</releases>
29+
<snapshots>
30+
<enabled>false</enabled>
31+
</snapshots>
32+
<id>env-proxy-plugins</id>
33+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
</profile>
37+
</profiles>
38+
39+
</settings>

‎dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/settings.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<settings>
2+
<profiles>
3+
<profile>
4+
<id>with-proxy</id>
5+
<activation>
6+
<property>
7+
<name>env.MAVEN_REPOSITORY_PROXY</name>
8+
</property>
9+
</activation>
10+
<repositories>
11+
<repository>
12+
<id>env-proxy</id>
13+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
14+
<releases>
15+
<enabled>true</enabled>
16+
<updatePolicy>always</updatePolicy>
17+
</releases>
18+
<snapshots>
19+
<enabled>true</enabled>
20+
<updatePolicy>always</updatePolicy>
21+
</snapshots>
22+
</repository>
23+
</repositories>
24+
<pluginRepositories>
25+
<pluginRepository>
26+
<releases>
27+
<updatePolicy>never</updatePolicy>
28+
</releases>
29+
<snapshots>
30+
<enabled>false</enabled>
31+
</snapshots>
32+
<id>env-proxy-plugins</id>
33+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
</profile>
37+
</profiles>
38+
39+
</settings>

‎dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering/settings.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<settings>
2+
<profiles>
3+
<profile>
4+
<id>with-proxy</id>
5+
<activation>
6+
<property>
7+
<name>env.MAVEN_REPOSITORY_PROXY</name>
8+
</property>
9+
</activation>
10+
<repositories>
11+
<repository>
12+
<id>env-proxy</id>
13+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
14+
<releases>
15+
<enabled>true</enabled>
16+
<updatePolicy>always</updatePolicy>
17+
</releases>
18+
<snapshots>
19+
<enabled>true</enabled>
20+
<updatePolicy>always</updatePolicy>
21+
</snapshots>
22+
</repository>
23+
</repositories>
24+
<pluginRepositories>
25+
<pluginRepository>
26+
<releases>
27+
<updatePolicy>never</updatePolicy>
28+
</releases>
29+
<snapshots>
30+
<enabled>false</enabled>
31+
</snapshots>
32+
<id>env-proxy-plugins</id>
33+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
34+
</pluginRepository>
35+
</pluginRepositories>
36+
</profile>
37+
</profiles>
38+
39+
</settings>

0 commit comments

Comments
 (0)