This is an automated email from the ASF dual-hosted git repository.
yasithdev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 20aea9112a build: consolidate the Testcontainers Ryuk-disable flag
into root surefire (#633)
20aea9112a is described below
commit 20aea9112ab7d7fac3d5c11dee8fcdc437b3b82e
Author: Yasith Jayawardana <[email protected]>
AuthorDate: Sun Jun 7 18:45:47 2026 -0400
build: consolidate the Testcontainers Ryuk-disable flag into root surefire
(#633)
TESTCONTAINERS_RYUK_DISABLED=true was repeated in four module surefire
blocks (airavata-api, iam, compute, orchestration); this hoists it into the
root maven-surefire-plugin configuration so it applies to every module's tests
via inheritance and removes the three RYUK-only blocks plus airavata-api's
copy. Verified with help:effective-pom that the flag still reaches
iam/compute/orchestration and now also the other Testcontainers modules, and
the reactor builds green.
---
airavata-api/compute-service/pom.xml | 12 ------------
airavata-api/iam-service/pom.xml | 12 ------------
airavata-api/orchestration-service/pom.xml | 12 ------------
airavata-api/pom.xml | 3 ---
pom.xml | 4 ++++
5 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/airavata-api/compute-service/pom.xml
b/airavata-api/compute-service/pom.xml
index f186082bdc..7fbae07696 100644
--- a/airavata-api/compute-service/pom.xml
+++ b/airavata-api/compute-service/pom.xml
@@ -159,18 +159,6 @@ under the License.
</annotationProcessorPaths>
</configuration>
</plugin>
-
- <!-- Run Tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <environmentVariables>
-
<TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
- </environmentVariables>
- </configuration>
- </plugin>
</plugins>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
diff --git a/airavata-api/iam-service/pom.xml b/airavata-api/iam-service/pom.xml
index c12072c9ef..f579235c01 100644
--- a/airavata-api/iam-service/pom.xml
+++ b/airavata-api/iam-service/pom.xml
@@ -129,18 +129,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <!-- Run Tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <environmentVariables>
-
<TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
- </environmentVariables>
- </configuration>
- </plugin>
</plugins>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
diff --git a/airavata-api/orchestration-service/pom.xml
b/airavata-api/orchestration-service/pom.xml
index 4d79315590..e0eb57967c 100644
--- a/airavata-api/orchestration-service/pom.xml
+++ b/airavata-api/orchestration-service/pom.xml
@@ -200,18 +200,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <!-- Run Tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <environmentVariables>
-
<TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
- </environmentVariables>
- </configuration>
- </plugin>
</plugins>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml
index c0fcf03cc3..cc07715d0d 100644
--- a/airavata-api/pom.xml
+++ b/airavata-api/pom.xml
@@ -390,9 +390,6 @@ under the License.
<systemPropertyVariables>
<credential.module.directory>${basedir}</credential.module.directory>
</systemPropertyVariables>
- <environmentVariables>
- <TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
- </environmentVariables>
<argLine>-Dapi.version=1.43</argLine>
<excludes>
<exclude>**/DAOBaseTestCase.java</exclude>
diff --git a/pom.xml b/pom.xml
index 93f3824a85..98dbbe86ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -496,6 +496,10 @@ under the License.
<useSystemClassLoader>false</useSystemClassLoader>
<forkCount>1C</forkCount>
<reuseForks>true</reuseForks>
+ <!-- Disable the Testcontainers Ryuk reaper (incompatible
with the DinD CI environment) -->
+ <environmentVariables>
+
<TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
+ </environmentVariables>
<!-- Fail on first error for fast feedback during
development -->
<skipAfterFailureCount>1</skipAfterFailureCount>
<excludes>
