Skip to content

Commit 02945a2

Browse files
remove debug and m2 folder changes
1 parent f7d57f9 commit 02945a2

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ default:
164164
- source .gitlab/gitlab-utils.sh
165165
- mkdir -p .gradle
166166
- export GRADLE_USER_HOME=$(pwd)/.gradle
167-
- mkdir -p .m2
168-
- export MAVEN_USER_HOME=$(pwd)/.m2
169167
- |
170168
# Don't put jvm args here as it will be picked up by child gradle processes used in tests
171169
cat << EOF > $GRADLE_USER_HOME/gradle.properties

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
306306
}
307307

308308
private int whenRunningMavenBuild(List<String> additionalAgentArgs, List<String> additionalCommandLineParams, Map<String, String> additionalEnvVars, boolean setServiceName = true) {
309-
def processBuilder = createProcessBuilder(["-B", "-X", "test"] + additionalCommandLineParams, true, setServiceName, additionalAgentArgs, additionalEnvVars)
309+
def processBuilder = createProcessBuilder(["-B", "test"] + additionalCommandLineParams, true, setServiceName, additionalAgentArgs, additionalEnvVars)
310310

311311
processBuilder.environment().put("DD_API_KEY", "01234567890abcdef123456789ABCDEF")
312312

@@ -371,11 +371,6 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
371371
"-Dmaven.multiModuleProjectDirectory=${projectHome.toAbsolutePath()}".toString(),
372372
]
373373

374-
String m2 = System.getenv().get("MAVEN_USER_HOME")
375-
if (m2 != null) {
376-
arguments += "-Dmaven.repo.local=${m2}".toString()
377-
}
378-
379374
if (runWithAgent) {
380375
if (System.getenv("DD_CIVISIBILITY_SMOKETEST_DEBUG_PARENT") != null) {
381376
// for convenience when debugging locally

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,4 @@
6060
<scope>test</scope>
6161
</dependency>
6262
</dependencies>
63-
6463
</project>

0 commit comments

Comments
 (0)