Skip to content

Commit d0b8bb8

Browse files
randomandersonrandomanderson
committed
Cleanup for PR
1 parent 6f44553 commit d0b8bb8

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ test_debugger:
635635
test_smoke:
636636
extends: .test_job
637637
variables:
638-
GRADLE_TARGET: "stageMainDist :dd-smoke-tests:maven:test"
638+
GRADLE_TARGET: "stageMainDist :smokeTest"
639639
GRADLE_PARAMS: "-PskipFlakyTests"
640640
CACHE_TYPE: "smoke"
641641
parallel:

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,19 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
9898
"test_successful_maven_run" | "3.6.3" | 5 | 1 | true | true | false | true | [] | 8
9999
"test_successful_maven_run" | "3.8.8" | 5 | 1 | true | true | false | true | [] | 8
100100
"test_successful_maven_run" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8
101-
// "test_successful_maven_run_surefire_3_0_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8
102-
// "test_successful_maven_run_surefire_3_0_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17
103-
// "test_successful_maven_run_surefire_3_5_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8
104-
// "test_successful_maven_run_surefire_3_5_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17
105-
// "test_successful_maven_run_builtin_coverage" | "3.9.9" | 5 | 1 | true | true | false | false | [] | 8
106-
// "test_successful_maven_run_with_jacoco_and_argline" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8
107-
// // "expectedEvents" count for this test case does not include the spans that correspond to Cucumber steps
108-
// "test_successful_maven_run_with_cucumber" | "3.9.9" | 4 | 1 | true | false | false | true | [] | 8
109-
// "test_failed_maven_run_flaky_retries" | "3.9.9" | 8 | 5 | false | false | true | true | [] | 8
110-
// "test_successful_maven_run_junit_platform_runner" | "3.9.9" | 4 | 0 | true | false | false | false | [] | 8
111-
// "test_successful_maven_run_with_arg_line_property" | "3.9.9" | 4 | 0 | true | false | false | false | ["-DargLine='-Dmy-custom-property=provided-via-command-line'"] | 8
112-
// "test_successful_maven_run_multiple_forks" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8
113-
// "test_successful_maven_run_multiple_forks" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17
101+
"test_successful_maven_run_surefire_3_0_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8
102+
"test_successful_maven_run_surefire_3_0_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17
103+
"test_successful_maven_run_surefire_3_5_0" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8
104+
"test_successful_maven_run_surefire_3_5_0" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17
105+
"test_successful_maven_run_builtin_coverage" | "3.9.9" | 5 | 1 | true | true | false | false | [] | 8
106+
"test_successful_maven_run_with_jacoco_and_argline" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8
107+
// "expectedEvents" count for this test case does not include the spans that correspond to Cucumber steps
108+
"test_successful_maven_run_with_cucumber" | "3.9.9" | 4 | 1 | true | false | false | true | [] | 8
109+
"test_failed_maven_run_flaky_retries" | "3.9.9" | 8 | 5 | false | false | true | true | [] | 8
110+
"test_successful_maven_run_junit_platform_runner" | "3.9.9" | 4 | 0 | true | false | false | false | [] | 8
111+
"test_successful_maven_run_with_arg_line_property" | "3.9.9" | 4 | 0 | true | false | false | false | ["-DargLine='-Dmy-custom-property=provided-via-command-line'"] | 8
112+
"test_successful_maven_run_multiple_forks" | "3.9.9" | 5 | 1 | true | true | false | true | [] | 8
113+
"test_successful_maven_run_multiple_forks" | LATEST_MAVEN_VERSION | 5 | 1 | true | true | false | true | [] | 17
114114
}
115115

116116
def "test test management"() {
@@ -370,7 +370,6 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
370370
"-Dmaven.mainClass=org.apache.maven.cli.MavenCli".toString(),
371371
"-Dmaven.multiModuleProjectDirectory=${projectHome.toAbsolutePath()}".toString(),
372372
]
373-
374373
if (runWithAgent) {
375374
if (System.getenv("DD_CIVISIBILITY_SMOKETEST_DEBUG_PARENT") != null) {
376375
// for convenience when debugging locally

0 commit comments

Comments
 (0)