Restructure tenant-base/pom.xml to reuse surefire configuration

4 files changed, 37 insertions, 88 deletions

diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml
index 78286472b76..9c3a28964ed 100644
--- a/tenant-base/pom.xml
+++ b/tenant-base/pom.xml
@@ -41,7 +41,6 @@
 
     <dependencyManagement>
         <dependencies>
-
             <dependency>
                 <groupId>com.yahoo.vespa</groupId>
                 <artifactId>container-dependency-versions</artifactId>
@@ -49,7 +48,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 
@@ -224,29 +222,9 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${surefire_version}</version>
                         <configuration>
                             <groups>ai.vespa.hosted.cd.SystemTest</groups>
-                            <excludedGroups />
-                            <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
-                            <redirectTestOutputToFile>false</redirectTestOutputToFile>
-                            <trimStackTrace>false</trimStackTrace>
-                            <systemPropertyVariables>
-                                <application>${application}</application>
-                                <tenant>${tenant}</tenant>
-                                <instance>${instance}</instance>
-                                <endpoint>${endpoint}</endpoint>
-                                <privateKeyFile>${privateKeyFile}</privateKeyFile>
-                                <certificateFile>${certificateFile}</certificateFile>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-report-plugin</artifactId>
-                        <version>${surefire_version}</version>
-                        <configuration>
-                            <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
+                            <excludedGroups>ai.vespa.hosted.cd.EmptyGroup</excludedGroups>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -260,29 +238,9 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${surefire_version}</version>
                         <configuration>
                             <groups>ai.vespa.hosted.cd.StagingTest</groups>
-                            <excludedGroups />
-                            <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
-                            <redirectTestOutputToFile>false</redirectTestOutputToFile>
-			    <trimStackTrace>false</trimStackTrace>
-                            <systemPropertyVariables>
-                                <application>${application}</application>
-                                <tenant>${tenant}</tenant>
-                                <instance>${instance}</instance>
-                                <endpoint>${endpoint}</endpoint>
-                                <privateKeyFile>${privateKeyFile}</privateKeyFile>
-                                <certificateFile>${certificateFile}</certificateFile>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-report-plugin</artifactId>
-                        <version>${surefire_version}</version>
-                        <configuration>
-                            <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
+                            <excludedGroups>ai.vespa.hosted.cd.EmptyGroup</excludedGroups>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -296,29 +254,9 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${surefire_version}</version>
                         <configuration>
                             <groups>ai.vespa.hosted.cd.ProductionTest</groups>
-                            <excludedGroups />
-                            <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
-                            <redirectTestOutputToFile>false</redirectTestOutputToFile>
-			    <trimStackTrace>false</trimStackTrace>
-                            <systemPropertyVariables>
-                                <application>${application}</application>
-                                <tenant>${tenant}</tenant>
-                                <instance>${instance}</instance>
-                                <endpoint>${endpoint}</endpoint>
-                                <privateKeyFile>${privateKeyFile}</privateKeyFile>
-                                <certificateFile>${certificateFile}</certificateFile>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-report-plugin</artifactId>
-                        <version>${surefire_version}</version>
-                        <configuration>
-                            <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
+                            <excludedGroups>ai.vespa.hosted.cd.EmptyGroup</excludedGroups>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -328,8 +266,38 @@
 
     <build>
         <finalName>${project.artifactId}</finalName>
-        <plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${surefire_version}</version>
+                    <configuration>
+                        <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
+                        <redirectTestOutputToFile>false</redirectTestOutputToFile>
+                        <trimStackTrace>false</trimStackTrace>
+                        <systemPropertyVariables>
+                            <application>${application}</application>
+                            <tenant>${tenant}</tenant>
+                            <instance>${instance}</instance>
+                            <endpoint>${endpoint}</endpoint>
+                            <privateKeyFile>${privateKeyFile}</privateKeyFile>
+                            <certificateFile>${certificateFile}</certificateFile>
+                        </systemPropertyVariables>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-report-plugin</artifactId>
+                    <version>${surefire_version}</version>
+                    <configuration>
+                        <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
 
+        <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -393,17 +361,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire_version}</version>
                 <configuration>
-                    <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
-                    <systemPropertyVariables>
-                        <application>${application}</application>
-                        <tenant>${tenant}</tenant>
-                        <instance>${instance}</instance>
-                        <endpoint>${endpoint}</endpoint>
-                        <privateKeyFile>${privateKeyFile}</privateKeyFile>
-                        <certificateFile>${certificateFile}</certificateFile>
-                    </systemPropertyVariables>
                     <excludedGroups>
                         ai.vespa.hosted.cd.SystemTest,
                         ai.vespa.hosted.cd.StagingTest,
@@ -411,15 +369,6 @@
                     </excludedGroups>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>${surefire_version}</version>
-                <configuration>
-                    <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/tenant-cd/pom.xml b/tenant-cd/pom.xml
index 7270b3a0906..ba93bbe407d 100644
--- a/tenant-cd/pom.xml
+++ b/tenant-cd/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>ai.vespa.hosted</groupId>
-    <artifactId>cd</artifactId>
+    <artifactId>tenant-cd</artifactId>
     <name>Hosted Vespa tenant CD</name>
     <description>Test library for hosted Vespa applications.</description>
     <url>https://github.com/vespa-engine</url>
diff --git a/tenant-cd/src/main/java/ai/vespa/hosted/cd/TestConfig.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/TestConfig.java
index 6eee2c6ebb3..ed9aea0e9b0 100644
--- a/tenant-cd/src/main/java/ai/vespa/hosted/cd/TestConfig.java
+++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/TestConfig.java
@@ -93,7 +93,7 @@ public class TestConfig {
                 ? ControllerHttpClient.withKeyAndCertificate(endpoint, privateKeyFile, certificateFile.get())
                 : ControllerHttpClient.withSignatureKey(endpoint, privateKeyFile, id);
 
-
+        return null;
     }
 
     static TestConfig fromJson(byte[] jsonBytes) {
diff --git a/tenant-cd/src/main/java/ai/vespa/hosted/cd/metric/Metrics.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metric/Metrics.java
index 3a3800beb20..3aa5a126745 100644
--- a/tenant-cd/src/main/java/ai/vespa/hosted/cd/metric/Metrics.java
+++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metric/Metrics.java
@@ -12,7 +12,7 @@ import static java.util.Map.copyOf;
 /**
  * Metrics from a Vespa application {@link Endpoint}, indexed by their names, and optionally by a set of custom dimensions.
  *
- * Metrics are collected from the <a href="https://docs.vespa.ai/documentation/reference/metrics-health-format.html>metrics</a>
+ * Metrics are collected from the <a href="https://docs.vespa.ai/documentation/reference/metrics-health-format.html">metrics</a>
  * API of a Vespa endpoint, and contain the current health status of the endpoint, values for all configured metrics in
  * that endpoint, and the time interval from which these metrics were sampled.
  *