Skip to content

Commit 4d8bfe0

Browse files
nikita-tkachenko-datadognikita-tkachenko-datadog
committed
Update Maven smoke tests to use repository proxy
1 parent 0b95f68 commit 4d8bfe0

File tree

17 files changed

+565
-0
lines changed
  • dd-smoke-tests/maven
    • build.gradle
    • src/test
      • groovy/datadog/smoketest
      • resources
        • test_failed_maven_run_flaky_retries
        • test_successful_maven_run
        • test_successful_maven_run_builtin_coverage
        • test_successful_maven_run_child_service_propagation
        • test_successful_maven_run_impacted_tests
        • test_successful_maven_run_junit4_class_ordering
        • test_successful_maven_run_junit4_class_ordering_parallel
        • test_successful_maven_run_junit_platform_runner
        • test_successful_maven_run_multiple_forks
        • test_successful_maven_run_surefire_3_0_0
        • test_successful_maven_run_surefire_3_5_0
        • test_successful_maven_run_test_management
        • test_successful_maven_run_with_arg_line_property
        • test_successful_maven_run_with_cucumber
        • test_successful_maven_run_with_jacoco_and_argline

17 files changed

+565
-0
lines changed

‎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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,11 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
358358
processBuilder.environment().put(envVar.key, envVar.value)
359359
}
360360

361+
def mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY")
362+
if (mavenRepositoryProxy != null) {
363+
processBuilder.environment().put("MAVEN_REPOSITORY_PROXY", mavenRepositoryProxy)
364+
}
365+
361366
return processBuilder
362367
}
363368

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,43 @@
4040
</pluginRepository>
4141
</pluginRepositories>
4242

43+
<profiles>
44+
<profile>
45+
<id>with-proxy</id>
46+
<activation>
47+
<property>
48+
<name>env.MAVEN_REPOSITORY_PROXY</name>
49+
</property>
50+
</activation>
51+
<repositories>
52+
<repository>
53+
<id>env-proxy</id>
54+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
55+
<releases>
56+
<enabled>true</enabled>
57+
<updatePolicy>always</updatePolicy>
58+
</releases>
59+
<snapshots>
60+
<enabled>true</enabled>
61+
<updatePolicy>always</updatePolicy>
62+
</snapshots>
63+
</repository>
64+
</repositories>
65+
<pluginRepositories>
66+
<pluginRepository>
67+
<releases>
68+
<updatePolicy>never</updatePolicy>
69+
</releases>
70+
<snapshots>
71+
<enabled>false</enabled>
72+
</snapshots>
73+
<id>env-proxy-plugins</id>
74+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
75+
</pluginRepository>
76+
</pluginRepositories>
77+
</profile>
78+
</profiles>
79+
4380
<dependencies>
4481
<dependency>
4582
<groupId>junit</groupId>

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,43 @@
4040
</pluginRepository>
4141
</pluginRepositories>
4242

43+
<profiles>
44+
<profile>
45+
<id>with-proxy</id>
46+
<activation>
47+
<property>
48+
<name>env.MAVEN_REPOSITORY_PROXY</name>
49+
</property>
50+
</activation>
51+
<repositories>
52+
<repository>
53+
<id>env-proxy</id>
54+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
55+
<releases>
56+
<enabled>true</enabled>
57+
<updatePolicy>always</updatePolicy>
58+
</releases>
59+
<snapshots>
60+
<enabled>true</enabled>
61+
<updatePolicy>always</updatePolicy>
62+
</snapshots>
63+
</repository>
64+
</repositories>
65+
<pluginRepositories>
66+
<pluginRepository>
67+
<releases>
68+
<updatePolicy>never</updatePolicy>
69+
</releases>
70+
<snapshots>
71+
<enabled>false</enabled>
72+
</snapshots>
73+
<id>env-proxy-plugins</id>
74+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
75+
</pluginRepository>
76+
</pluginRepositories>
77+
</profile>
78+
</profiles>
79+
4380
<dependencies>
4481
<dependency>
4582
<groupId>junit</groupId>

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,43 @@
4040
</pluginRepository>
4141
</pluginRepositories>
4242

43+
<profiles>
44+
<profile>
45+
<id>with-proxy</id>
46+
<activation>
47+
<property>
48+
<name>env.MAVEN_REPOSITORY_PROXY</name>
49+
</property>
50+
</activation>
51+
<repositories>
52+
<repository>
53+
<id>env-proxy</id>
54+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
55+
<releases>
56+
<enabled>true</enabled>
57+
<updatePolicy>always</updatePolicy>
58+
</releases>
59+
<snapshots>
60+
<enabled>true</enabled>
61+
<updatePolicy>always</updatePolicy>
62+
</snapshots>
63+
</repository>
64+
</repositories>
65+
<pluginRepositories>
66+
<pluginRepository>
67+
<releases>
68+
<updatePolicy>never</updatePolicy>
69+
</releases>
70+
<snapshots>
71+
<enabled>false</enabled>
72+
</snapshots>
73+
<id>env-proxy-plugins</id>
74+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
75+
</pluginRepository>
76+
</pluginRepositories>
77+
</profile>
78+
</profiles>
79+
4380
<dependencies>
4481
<dependency>
4582
<groupId>junit</groupId>

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,43 @@
4040
</pluginRepository>
4141
</pluginRepositories>
4242

43+
<profiles>
44+
<profile>
45+
<id>with-proxy</id>
46+
<activation>
47+
<property>
48+
<name>env.MAVEN_REPOSITORY_PROXY</name>
49+
</property>
50+
</activation>
51+
<repositories>
52+
<repository>
53+
<id>env-proxy</id>
54+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
55+
<releases>
56+
<enabled>true</enabled>
57+
<updatePolicy>always</updatePolicy>
58+
</releases>
59+
<snapshots>
60+
<enabled>true</enabled>
61+
<updatePolicy>always</updatePolicy>
62+
</snapshots>
63+
</repository>
64+
</repositories>
65+
<pluginRepositories>
66+
<pluginRepository>
67+
<releases>
68+
<updatePolicy>never</updatePolicy>
69+
</releases>
70+
<snapshots>
71+
<enabled>false</enabled>
72+
</snapshots>
73+
<id>env-proxy-plugins</id>
74+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
75+
</pluginRepository>
76+
</pluginRepositories>
77+
</profile>
78+
</profiles>
79+
4380
<dependencies>
4481
<dependency>
4582
<groupId>junit</groupId>

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,43 @@
4040
</pluginRepository>
4141
</pluginRepositories>
4242

43+
<profiles>
44+
<profile>
45+
<id>with-proxy</id>
46+
<activation>
47+
<property>
48+
<name>env.MAVEN_REPOSITORY_PROXY</name>
49+
</property>
50+
</activation>
51+
<repositories>
52+
<repository>
53+
<id>env-proxy</id>
54+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
55+
<releases>
56+
<enabled>true</enabled>
57+
<updatePolicy>always</updatePolicy>
58+
</releases>
59+
<snapshots>
60+
<enabled>true</enabled>
61+
<updatePolicy>always</updatePolicy>
62+
</snapshots>
63+
</repository>
64+
</repositories>
65+
<pluginRepositories>
66+
<pluginRepository>
67+
<releases>
68+
<updatePolicy>never</updatePolicy>
69+
</releases>
70+
<snapshots>
71+
<enabled>false</enabled>
72+
</snapshots>
73+
<id>env-proxy-plugins</id>
74+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
75+
</pluginRepository>
76+
</pluginRepositories>
77+
</profile>
78+
</profiles>
79+
4380
<dependencies>
4481
<dependency>
4582
<groupId>junit</groupId>

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,43 @@
4040
</pluginRepository>
4141
</pluginRepositories>
4242

43+
<profiles>
44+
<profile>
45+
<id>with-proxy</id>
46+
<activation>
47+
<property>
48+
<name>env.MAVEN_REPOSITORY_PROXY</name>
49+
</property>
50+
</activation>
51+
<repositories>
52+
<repository>
53+
<id>env-proxy</id>
54+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
55+
<releases>
56+
<enabled>true</enabled>
57+
<updatePolicy>always</updatePolicy>
58+
</releases>
59+
<snapshots>
60+
<enabled>true</enabled>
61+
<updatePolicy>always</updatePolicy>
62+
</snapshots>
63+
</repository>
64+
</repositories>
65+
<pluginRepositories>
66+
<pluginRepository>
67+
<releases>
68+
<updatePolicy>never</updatePolicy>
69+
</releases>
70+
<snapshots>
71+
<enabled>false</enabled>
72+
</snapshots>
73+
<id>env-proxy-plugins</id>
74+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
75+
</pluginRepository>
76+
</pluginRepositories>
77+
</profile>
78+
</profiles>
79+
4380
<dependencies>
4481
<dependency>
4582
<groupId>junit</groupId>

‎dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit4_class_ordering_parallel/pom.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,43 @@
4040
</pluginRepository>
4141
</pluginRepositories>
4242

43+
<profiles>
44+
<profile>
45+
<id>with-proxy</id>
46+
<activation>
47+
<property>
48+
<name>env.MAVEN_REPOSITORY_PROXY</name>
49+
</property>
50+
</activation>
51+
<repositories>
52+
<repository>
53+
<id>env-proxy</id>
54+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
55+
<releases>
56+
<enabled>true</enabled>
57+
<updatePolicy>always</updatePolicy>
58+
</releases>
59+
<snapshots>
60+
<enabled>true</enabled>
61+
<updatePolicy>always</updatePolicy>
62+
</snapshots>
63+
</repository>
64+
</repositories>
65+
<pluginRepositories>
66+
<pluginRepository>
67+
<releases>
68+
<updatePolicy>never</updatePolicy>
69+
</releases>
70+
<snapshots>
71+
<enabled>false</enabled>
72+
</snapshots>
73+
<id>env-proxy-plugins</id>
74+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
75+
</pluginRepository>
76+
</pluginRepositories>
77+
</profile>
78+
</profiles>
79+
4380
<dependencies>
4481
<dependency>
4582
<groupId>junit</groupId>

‎dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/pom.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,43 @@
3838
</pluginRepository>
3939
</pluginRepositories>
4040

41+
<profiles>
42+
<profile>
43+
<id>with-proxy</id>
44+
<activation>
45+
<property>
46+
<name>env.MAVEN_REPOSITORY_PROXY</name>
47+
</property>
48+
</activation>
49+
<repositories>
50+
<repository>
51+
<id>env-proxy</id>
52+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
53+
<releases>
54+
<enabled>true</enabled>
55+
<updatePolicy>always</updatePolicy>
56+
</releases>
57+
<snapshots>
58+
<enabled>true</enabled>
59+
<updatePolicy>always</updatePolicy>
60+
</snapshots>
61+
</repository>
62+
</repositories>
63+
<pluginRepositories>
64+
<pluginRepository>
65+
<releases>
66+
<updatePolicy>never</updatePolicy>
67+
</releases>
68+
<snapshots>
69+
<enabled>false</enabled>
70+
</snapshots>
71+
<id>env-proxy-plugins</id>
72+
<url>${env.MAVEN_REPOSITORY_PROXY}</url>
73+
</pluginRepository>
74+
</pluginRepositories>
75+
</profile>
76+
</profiles>
77+
4178
<dependencyManagement>
4279
<dependencies>
4380
<dependency>

0 commit comments

Comments
 (0)