From 5f04a3a9ecfbf463f2b50508f885e71599107ca6 Mon Sep 17 00:00:00 2001
From: dna-minn <minn@dnastack.com>
Date: Mon, 20 Nov 2023 14:21:10 -0500
Subject: [PATCH] [#182563382] - Delete settings.xml from docker image and
 configure surefire reports directory

---
 ci/e2e-tests/Dockerfile | 17 +++++++++++------
 e2e-tests/pom.xml       |  2 ++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ci/e2e-tests/Dockerfile b/ci/e2e-tests/Dockerfile
index 720e0af..dab4848 100644
--- a/ci/e2e-tests/Dockerfile
+++ b/ci/e2e-tests/Dockerfile
@@ -26,6 +26,9 @@ RUN ./mvnw -P -dnastack -B -Presolve-dependencies initialize
 RUN ./mvnw -P -dnastack -B de.qaware.maven:go-offline-maven-plugin:resolve-dependencies
 RUN ./mvnw -P -dnastack -B versions:set -DnewVersion=${APP_VERSION}
 
+# Delete settings*.xml files that contain GitHub credentials
+RUN rm /root/.m2/settings*.xml
+
 # Now add sources, which will bust the cache.
 ADD target/src ./src
 
@@ -56,14 +59,16 @@ USER root
 RUN mkdir /target && chown testuser /target
 
 # Copy required files from build stage into image
-COPY --from=build --chown=testuser /build/target/ /target
-COPY --from=build --chown=testuser /root/.m2 /home/testuser/.m2/
-COPY --chown=testuser target/pom.xml /pom.xml
-COPY --chown=testuser target/.mvn /.mvn
-COPY --chown=testuser target/mvnw /
+COPY --from=build --chown=testuser /build/target/ /home/testuser/target
+COPY --from=build --chown=testuser /root/.m2/ /home/testuser/.m2/
+COPY --chown=testuser target/pom.xml /home/testuser/pom.xml
+COPY --chown=testuser target/.mvn /home/testuser/.mvn
+COPY --chown=testuser target/mvnw /home/testuser
 
 USER testuser
 
+WORKDIR /home/testuser
+
 ENV E2E_SCREENSHOT_DIR /target
 
 # If the container has a memory limit, that limit (in bytes) is present in a file under /sys/fs/cgroup
@@ -71,4 +76,4 @@ ENV E2E_SCREENSHOT_DIR /target
 # If the container doesn't have a set memory limit, the file contains "max", hence we fall back to a default value of 2GiB
 # In Linux 5.4.129, the value comes from memory/memory.limit_in_bytes
 # If the container doesn't have a set memory limit, the file will be blank, hence we fall back to a default value of 2Gib
-ENTRYPOINT ["./mvnw", "-B", "-o", "test"]
\ No newline at end of file
+ENTRYPOINT ["./mvnw", "-B", "-o", "-DreportsDirectory=/target/surefire-reports", "test"]
\ No newline at end of file
diff --git a/e2e-tests/pom.xml b/e2e-tests/pom.xml
index dfccf8d..d8e6537 100644
--- a/e2e-tests/pom.xml
+++ b/e2e-tests/pom.xml
@@ -17,6 +17,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+        <reportsDirectory/>
         <junit.version>5.8.2</junit.version>
         <restassured.version>4.5.1</restassured.version>
         <slf4j.version>2.0.1</slf4j.version>
@@ -178,6 +179,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
+                    <reportsDirectory>${reportsDirectory}</reportsDirectory>
                     <dependenciesToScan>
                         <dependency>com.dnastack:actuator-e2e-test</dependency>
                     </dependenciesToScan>