From bb4a007c3e8968dee66be404eae7eea83e2c88b0 Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Thu, 19 Dec 2024 09:20:42 +0100
Subject: [PATCH] test: improve reliability of concurrently run tests

Signed-off-by: Marc Nuri <marc@marcnuri.com>
---
 httpclient-jdk/pom.xml                        | 26 -------------------
 httpclient-jetty/pom.xml                      | 26 -------------------
 httpclient-okhttp/pom.xml                     | 25 +-----------------
 httpclient-vertx/pom.xml                      | 25 +-----------------
 .../AbstractSimultaneousConnectionsTest.java  |  2 +-
 platforms/karaf/itests/pom.xml                |  1 +
 pom.xml                                       |  1 +
 7 files changed, 5 insertions(+), 101 deletions(-)

diff --git a/httpclient-jdk/pom.xml b/httpclient-jdk/pom.xml
index 3d383ccb1e..48e68ecd5c 100644
--- a/httpclient-jdk/pom.xml
+++ b/httpclient-jdk/pom.xml
@@ -86,32 +86,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <!-- We cleanup system properties an env vars, so that we can test in a predictable env -->
-          <environmentVariables>
-            <KUBERNETES_MASTER />
-            <KUBERNETES_API_VERSION />
-            <KUBERNETES_TRUST_CERTIFICATES />
-            <KUBERNETES_CERTS_CA_FILE />
-            <KUBERNETES_CERTS_CA_DATA />
-            <KUBERNETES_CERTS_CLIENT_FILE />
-            <KUBERNETES_CERTS_CLIENT_DATA />
-            <KUBERNETES_CERTS_CLIENT_KEY_FILE />
-            <KUBERNETES_CERTS_CLIENT_KEY_DATA />
-            <KUBERNETES_CERTS_CLIENT_KEY_ALGO />
-            <KUBERNETES_CERTS_CLIENT_KEY_PASSPHRASE />
-            <KUBERNETES_AUTH_BASIC_USERNAME />
-            <KUBERNETES_AUTH_BASIC_PASSWORD />
-            <KUBERNETES_AUTH_TRYKUBECONFIG />
-            <KUBERNETES_AUTH_TRYSERVICEACCOUNT />
-            <KUBERNETES_AUTH_TOKEN />
-            <KUBERNETES_WATCH_RECONNECTINTERVAL />
-            <KUBERNETES_WATCH_RECONNECTLIMIT />
-            <KUBERNETES_REQUEST_TIMEOUT />
-            <KUBERNETES_NAMESPACE />
-            <KUBERNETES_TLS_VERSIONS>TLSv1.2,TLSv1.1,TLSv1</KUBERNETES_TLS_VERSIONS>
-          </environmentVariables>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/httpclient-jetty/pom.xml b/httpclient-jetty/pom.xml
index 3393b69025..6dfcbc1e05 100644
--- a/httpclient-jetty/pom.xml
+++ b/httpclient-jetty/pom.xml
@@ -100,32 +100,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <!-- We cleanup system properties an env vars, so that we can test in a predictable env -->
-          <environmentVariables>
-            <KUBERNETES_MASTER />
-            <KUBERNETES_API_VERSION />
-            <KUBERNETES_TRUST_CERTIFICATES />
-            <KUBERNETES_CERTS_CA_FILE />
-            <KUBERNETES_CERTS_CA_DATA />
-            <KUBERNETES_CERTS_CLIENT_FILE />
-            <KUBERNETES_CERTS_CLIENT_DATA />
-            <KUBERNETES_CERTS_CLIENT_KEY_FILE />
-            <KUBERNETES_CERTS_CLIENT_KEY_DATA />
-            <KUBERNETES_CERTS_CLIENT_KEY_ALGO />
-            <KUBERNETES_CERTS_CLIENT_KEY_PASSPHRASE />
-            <KUBERNETES_AUTH_BASIC_USERNAME />
-            <KUBERNETES_AUTH_BASIC_PASSWORD />
-            <KUBERNETES_AUTH_TRYKUBECONFIG />
-            <KUBERNETES_AUTH_TRYSERVICEACCOUNT />
-            <KUBERNETES_AUTH_TOKEN />
-            <KUBERNETES_WATCH_RECONNECTINTERVAL />
-            <KUBERNETES_WATCH_RECONNECTLIMIT />
-            <KUBERNETES_REQUEST_TIMEOUT />
-            <KUBERNETES_NAMESPACE />
-            <KUBERNETES_TLS_VERSIONS>TLSv1.2,TLSv1.1,TLSv1</KUBERNETES_TLS_VERSIONS>
-          </environmentVariables>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/httpclient-okhttp/pom.xml b/httpclient-okhttp/pom.xml
index 007c8915c5..598d010e5c 100644
--- a/httpclient-okhttp/pom.xml
+++ b/httpclient-okhttp/pom.xml
@@ -101,30 +101,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <!-- We cleanup system properties an env vars, so that we can test in a predictable env -->
-          <environmentVariables>
-            <KUBERNETES_MASTER />
-            <KUBERNETES_API_VERSION />
-            <KUBERNETES_TRUST_CERTIFICATES />
-            <KUBERNETES_CERTS_CA_FILE />
-            <KUBERNETES_CERTS_CA_DATA />
-            <KUBERNETES_CERTS_CLIENT_FILE />
-            <KUBERNETES_CERTS_CLIENT_DATA />
-            <KUBERNETES_CERTS_CLIENT_KEY_FILE />
-            <KUBERNETES_CERTS_CLIENT_KEY_DATA />
-            <KUBERNETES_CERTS_CLIENT_KEY_ALGO />
-            <KUBERNETES_CERTS_CLIENT_KEY_PASSPHRASE />
-            <KUBERNETES_AUTH_BASIC_USERNAME />
-            <KUBERNETES_AUTH_BASIC_PASSWORD />
-            <KUBERNETES_AUTH_TRYKUBECONFIG />
-            <KUBERNETES_AUTH_TRYSERVICEACCOUNT />
-            <KUBERNETES_AUTH_TOKEN />
-            <KUBERNETES_WATCH_RECONNECTINTERVAL />
-            <KUBERNETES_WATCH_RECONNECTLIMIT />
-            <KUBERNETES_REQUEST_TIMEOUT />
-            <KUBERNETES_NAMESPACE />
-            <KUBERNETES_TLS_VERSIONS>TLSv1.2,TLSv1.1,TLSv1</KUBERNETES_TLS_VERSIONS>
-          </environmentVariables>
+          <rerunFailingTestsCount>1</rerunFailingTestsCount>
         </configuration>
       </plugin>
       <plugin>
diff --git a/httpclient-vertx/pom.xml b/httpclient-vertx/pom.xml
index 2769e9fd06..2245051fd5 100644
--- a/httpclient-vertx/pom.xml
+++ b/httpclient-vertx/pom.xml
@@ -106,30 +106,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <!-- We cleanup system properties an env vars, so that we can test in a predictable env -->
-          <environmentVariables>
-            <KUBERNETES_MASTER />
-            <KUBERNETES_API_VERSION />
-            <KUBERNETES_TRUST_CERTIFICATES />
-            <KUBERNETES_CERTS_CA_FILE />
-            <KUBERNETES_CERTS_CA_DATA />
-            <KUBERNETES_CERTS_CLIENT_FILE />
-            <KUBERNETES_CERTS_CLIENT_DATA />
-            <KUBERNETES_CERTS_CLIENT_KEY_FILE />
-            <KUBERNETES_CERTS_CLIENT_KEY_DATA />
-            <KUBERNETES_CERTS_CLIENT_KEY_ALGO />
-            <KUBERNETES_CERTS_CLIENT_KEY_PASSPHRASE />
-            <KUBERNETES_AUTH_BASIC_USERNAME />
-            <KUBERNETES_AUTH_BASIC_PASSWORD />
-            <KUBERNETES_AUTH_TRYKUBECONFIG />
-            <KUBERNETES_AUTH_TRYSERVICEACCOUNT />
-            <KUBERNETES_AUTH_TOKEN />
-            <KUBERNETES_WATCH_RECONNECTINTERVAL />
-            <KUBERNETES_WATCH_RECONNECTLIMIT />
-            <KUBERNETES_REQUEST_TIMEOUT />
-            <KUBERNETES_NAMESPACE />
-            <KUBERNETES_TLS_VERSIONS>TLSv1.2,TLSv1.1,TLSv1</KUBERNETES_TLS_VERSIONS>
-          </environmentVariables>
+          <rerunFailingTestsCount>1</rerunFailingTestsCount>
         </configuration>
       </plugin>
       <plugin>
diff --git a/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractSimultaneousConnectionsTest.java b/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractSimultaneousConnectionsTest.java
index 998233f952..0b11046b1b 100644
--- a/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractSimultaneousConnectionsTest.java
+++ b/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractSimultaneousConnectionsTest.java
@@ -110,7 +110,7 @@ public void http1Connections() throws Exception {
         asyncResponses.add(client.consumeBytes(request, (value, asyncBody) -> asyncBody.consume()));
         handler.await();
       }
-      CompletableFuture.allOf(asyncResponses.toArray(new CompletableFuture[0])).get(60, TimeUnit.SECONDS);
+      CompletableFuture.allOf(asyncResponses.toArray(new CompletableFuture[0])).get(70, TimeUnit.SECONDS);
       assertThat(asyncResponses)
           .hasSize(MAX_HTTP_1_CONNECTIONS)
           .extracting(CompletableFuture::join)
diff --git a/platforms/karaf/itests/pom.xml b/platforms/karaf/itests/pom.xml
index 2e917b872c..408f60e659 100644
--- a/platforms/karaf/itests/pom.xml
+++ b/platforms/karaf/itests/pom.xml
@@ -165,6 +165,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <skip>${karaf.itest.skip}</skip>
+          <parallel>none</parallel>
           <systemPropertyVariables>
             <features.xml>${project.build.directory}/features.xml</features.xml>
             <features.repo>${project.build.directory}/features-repo</features.repo>
diff --git a/pom.xml b/pom.xml
index d631d0ffc5..1113bfb648 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1103,6 +1103,7 @@
             <ENV_VAR_EXISTS>value</ENV_VAR_EXISTS>
             <ENV_VAR_EXISTS_BOOLEAN>true</ENV_VAR_EXISTS_BOOLEAN>
           </environmentVariables>
+          <parallel>suitesAndClasses</parallel>
         </configuration>
       </plugin>