Skip to content

Commit 7f91252

Browse files
randomandersonrandomanderson
committed
Give names to projects and print command
1 parent 1e0e235 commit 7f91252

15 files changed

Lines changed: 19 additions & 17 deletions

File tree

  • dd-smoke-tests/maven/src/test
    • groovy/datadog/smoketest
    • resources
      • test_failed_maven_run_flaky_retries
      • test_successful_maven_run_builtin_coverage
      • test_successful_maven_run_child_service_propagation
      • test_successful_maven_run_junit4_class_ordering_parallel
      • test_successful_maven_run_junit4_class_ordering
      • 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
      • test_successful_maven_run

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
293293
private void retryUntilSuccessfulOrNoAttemptsLeft(List<String> mvnCommand, Map<String, String> additionalEnvVars = [:]) {
294294
def processBuilder = createProcessBuilder(mvnCommand, false, false, [], additionalEnvVars)
295295
for (int attempt = 0; attempt < DEPENDENCIES_DOWNLOAD_RETRIES; attempt++) {
296-
def exitCode = runProcess(processBuilder.start())
296+
def exitCode = runProcess(processBuilder)
297297
if (exitCode == 0) {
298298
return
299299
}
@@ -306,10 +306,12 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
306306

307307
processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF")
308308

309-
return runProcess(processBuilder.start())
309+
return runProcess(processBuilder)
310310
}
311311

312-
private static runProcess(Process p) {
312+
private static runProcess(ProcessBuilder processBuilder) {
313+
println "Starting: " + processBuilder.command().join(" ")
314+
Process p = processBuilder.start()
313315
StreamConsumer errorGobbler = new StreamConsumer(p.getErrorStream(), "ERROR")
314316
StreamConsumer outputGobbler = new StreamConsumer(p.getInputStream(), "OUTPUT")
315317
outputGobbler.start()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.datadog.ci.test</groupId>
77
<artifactId>maven-smoke-test</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<name>Maven Smoke Tests Project</name>
9+
<name>Failed Maven Run Flaky Retries</name>
1010

1111
<properties>
1212
<maven.compiler.source>8</maven.compiler.source>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.datadog.ci.test</groupId>
77
<artifactId>maven-smoke-test</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<name>Maven Smoke Tests Project</name>
9+
<name>Successful Maven Run</name>
1010

1111
<properties>
1212
<maven.compiler.source>8</maven.compiler.source>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.datadog.ci.test</groupId>
77
<artifactId>maven-smoke-test</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<name>Maven Smoke Tests Project</name>
9+
<name>Builtin Coverage</name>
1010

1111
<properties>
1212
<maven.compiler.source>8</maven.compiler.source>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.datadog.ci.test</groupId>
77
<artifactId>maven-smoke-test</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<name>Maven Smoke Tests Project</name>
9+
<name>Child Service Propagation</name>
1010

1111
<properties>
1212
<maven.compiler.source>8</maven.compiler.source>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.datadog.ci.test</groupId>
77
<artifactId>maven-smoke-test</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<name>Maven Smoke Tests Project</name>
9+
<name>Junit4 Class Ordering</name>
1010

1111
<properties>
1212
<maven.compiler.source>8</maven.compiler.source>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.datadog.ci.test</groupId>
77
<artifactId>maven-smoke-test</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<name>Maven Smoke Tests Project</name>
9+
<name>Junit4 Class Ordering Parallel</name>
1010

1111
<properties>
1212
<maven.compiler.source>8</maven.compiler.source>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.datadog.ci.test</groupId>
77
<artifactId>maven-smoke-test</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<name>Maven Smoke Tests Project</name>
9+
<name>Junit Platform Runner</name>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.datadog.ci.test</groupId>
77
<artifactId>maven-smoke-test</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<name>Maven Smoke Tests Project</name>
9+
<name>Multiple Forks</name>
1010

1111
<properties>
1212
<maven.compiler.source>8</maven.compiler.source>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.datadog.ci.test</groupId>
77
<artifactId>maven-smoke-test</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<name>Maven Smoke Tests Project</name>
9+
<name>Surefire 3.0.0</name>
1010

1111
<properties>
1212
<maven.compiler.source>8</maven.compiler.source>

0 commit comments

Comments
 (0)