concord-server-it: run most integration tests in parallel

ibodrov · ibodrov · commit 638a0b7348d1 · 2025-03-22T20:32:30.000-04:00
diff --git a/it/compat/pom.xml b/it/compat/pom.xml
@@ -101,6 +101,9 @@
                     <systemProperties>
                         <server.image>${server.image}</server.image>
                         <agent.image>${prev.agent.image}</agent.image>
+                        <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
+                        <junit.jupiter.execution.parallel.mode.default>concurrent</junit.jupiter.execution.parallel.mode.default>
+                        <junit.jupiter.execution.parallel.mode.classes.default>same_thread</junit.jupiter.execution.parallel.mode.classes.default>
                     </systemProperties>
                 </configuration>
             </plugin>
diff --git a/it/console/pom.xml b/it/console/pom.xml
@@ -116,6 +116,9 @@
                     </environmentVariables>
                     <systemProperties>
                         <java.io.tmpdir>${tmp.dir}</java.io.tmpdir>
+                        <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
+                        <junit.jupiter.execution.parallel.mode.default>concurrent</junit.jupiter.execution.parallel.mode.default>
+                        <junit.jupiter.execution.parallel.mode.classes.default>same_thread</junit.jupiter.execution.parallel.mode.classes.default>
                     </systemProperties>
                 </configuration>
             </plugin>
diff --git a/it/runtime-v1/pom.xml b/it/runtime-v1/pom.xml
@@ -116,6 +116,9 @@
                         <server.image>${server.image}</server.image>
                         <agent.image>${agent.image}</agent.image>
                         <ryuk.image>${ryuk.image}</ryuk.image>
+                        <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
+                        <junit.jupiter.execution.parallel.mode.default>concurrent</junit.jupiter.execution.parallel.mode.default>
+                        <junit.jupiter.execution.parallel.mode.classes.default>same_thread</junit.jupiter.execution.parallel.mode.classes.default>
                     </systemProperties>
                 </configuration>
             </plugin>
diff --git a/it/runtime-v1/src/test/java/com/walmartlabs/concord/it/runtime/v1/ConcordConfiguration.java b/it/runtime-v1/src/test/java/com/walmartlabs/concord/it/runtime/v1/ConcordConfiguration.java
@@ -36,7 +36,14 @@ public static ConcordRule configure() {
                 .streamServerLogs(true)
                 .streamAgentLogs(true)
                 .useLocalMavenRepository(true)
-                .extraConfigurationSupplier(() -> "concord-agent { prefork { enabled = true } }");
+                .extraConfigurationSupplier(() -> """
+                        concord-agent {
+                            workersCount = 8
+                            prefork {
+                                enabled = false
+                            }
+                        }
+                        """);
 
         boolean localMode = Boolean.parseBoolean(System.getProperty("it.local.mode"));
         if (localMode) {
diff --git a/it/runtime-v2/pom.xml b/it/runtime-v2/pom.xml
@@ -150,6 +150,9 @@
                         <db.image>${db.image}</db.image>
                         <server.image>${server.image}</server.image>
                         <agent.image>${agent.image}</agent.image>
+                        <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
+                        <junit.jupiter.execution.parallel.mode.default>concurrent</junit.jupiter.execution.parallel.mode.default>
+                        <junit.jupiter.execution.parallel.mode.classes.default>same_thread</junit.jupiter.execution.parallel.mode.classes.default>
                     </systemProperties>
                 </configuration>
             </plugin>
diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ConcordConfiguration.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ConcordConfiguration.java
@@ -60,11 +60,12 @@ public static ConcordRule configure() {
                 .useLocalMavenRepository(true)
                 .extraConfigurationSupplier(() -> """
                     concord-agent {
+                        workersCount = 8
                         dependencyResolveTimeout = "30 seconds"
                         logMaxDelay = "250 milliseconds"
                         pollInterval = "250 milliseconds"
                         prefork {
-                            enabled = true
+                            enabled = false
                         }
                     }
                     """);
diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ConcordTaskIT.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ConcordTaskIT.java
@@ -27,11 +27,14 @@
 import com.walmartlabs.concord.sdk.Constants;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Execution;
 
 import static com.walmartlabs.concord.it.common.ITUtils.randomString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class ConcordTaskIT extends AbstractTest {
 
     @RegisterExtension
diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/GitHubTriggersV2IT.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/GitHubTriggersV2IT.java
@@ -29,6 +29,7 @@
 import com.walmartlabs.concord.it.common.ITUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Execution;
 import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.nio.file.Path;
@@ -40,7 +41,9 @@
 
 import static com.walmartlabs.concord.it.common.ITUtils.randomString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class GitHubTriggersV2IT extends AbstractTest {
 
     @RegisterExtension
diff --git a/it/server/pom.xml b/it/server/pom.xml
@@ -251,6 +251,9 @@
                         <java.io.tmpdir>${tmp.dir}</java.io.tmpdir>
                         <isDocker>${is.docker.profile}</isDocker>
                         <local.mvn.repo>${local.repository.src.mount}</local.mvn.repo>
+                        <junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
+                        <junit.jupiter.execution.parallel.mode.default>concurrent</junit.jupiter.execution.parallel.mode.default>
+                        <junit.jupiter.execution.parallel.mode.classes.default>same_thread</junit.jupiter.execution.parallel.mode.classes.default>
                     </systemProperties>
                 </configuration>
             </plugin>
@@ -561,7 +564,7 @@
                                             <com.walmartlabs.concord.it.name>server</com.walmartlabs.concord.it.name>
                                         </labels>
                                         <log>
-                                            <prefix>SERVER </prefix>
+                                            <prefix>SERVER&nbsp;</prefix>
                                             <color>cyan</color>
                                         </log>
                                     </run>
diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/GeneralTriggerIT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/GeneralTriggerIT.java
@@ -24,13 +24,17 @@
 import com.walmartlabs.concord.common.IOUtils;
 import org.eclipse.jgit.api.Git;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.io.File;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
+
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class GeneralTriggerIT extends AbstractGeneralTriggerIT {
 
     @Test
diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/GeneralTriggerV2IT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/GeneralTriggerV2IT.java
@@ -24,13 +24,17 @@
 import com.walmartlabs.concord.common.IOUtils;
 import org.eclipse.jgit.api.Git;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.io.File;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
+
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class GeneralTriggerV2IT extends AbstractGeneralTriggerIT {
 
     private String orgName;
diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/GitHubTriggersV2IT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/GitHubTriggersV2IT.java
@@ -24,6 +24,8 @@
 import com.walmartlabs.concord.client2.ProcessListFilter;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
 import javax.naming.NameAlreadyBoundException;
 import javax.naming.directory.*;
@@ -34,7 +36,9 @@
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class GitHubTriggersV2IT extends AbstractGitHubTriggersIT {
 
     @AfterEach
diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/OutVariablesProjectIT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/OutVariablesProjectIT.java
@@ -22,6 +22,7 @@
 
 import com.walmartlabs.concord.client2.*;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -31,7 +32,9 @@
 import static com.walmartlabs.concord.it.common.ServerClient.assertLog;
 import static com.walmartlabs.concord.it.common.ServerClient.waitForCompletion;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class OutVariablesProjectIT extends AbstractServerIT {
 
     @Test
diff --git a/it/server/src/test/resources/agent.conf b/it/server/src/test/resources/agent.conf
@@ -4,8 +4,10 @@ concord-agent {
     logMaxDelay = "250 milliseconds"
     pollInterval = "250 milliseconds"
 
+    workersCount = 32
+
     prefork {
-        enabled = true
+        enabled = false
     }
 
     capabilities = {
diff --git a/it/server/src/test/resources/server.conf b/it/server/src/test/resources/server.conf
@@ -1,5 +1,7 @@
 concord-server {
     db {
+        maxPoolSize = 20
+
         changeLogParameters {
             defaultAdminToken = "cTFxMXExcTE="
             defaultAgentToken = "cTJxMnEycTI="
diff --git a/plugins/tasks/http/src/test/java/com/walmartlabs/concord/plugins/http/HttpTaskTest.java b/plugins/tasks/http/src/test/java/com/walmartlabs/concord/plugins/http/HttpTaskTest.java
@@ -25,6 +25,7 @@
 import com.walmartlabs.concord.sdk.Context;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -34,9 +35,11 @@
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class HttpTaskTest extends AbstractHttpTaskTest {
 
     private final Context mockContext = mock(Context.class);
diff --git a/plugins/tasks/mock/src/test/java/com/walmartlabs/concord/plugins/mock/MockTest.java b/plugins/tasks/mock/src/test/java/com/walmartlabs/concord/plugins/mock/MockTest.java
@@ -23,11 +23,14 @@
 import com.walmartlabs.concord.runtime.v2.runner.TestRuntimeV2;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.util.regex.Pattern;
 
 import static com.walmartlabs.concord.runtime.v2.runner.TestRuntimeV2.assertLog;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class MockTest {
 
     @RegisterExtension
diff --git a/plugins/tasks/mock/src/test/java/com/walmartlabs/concord/plugins/mock/VerifyTest.java b/plugins/tasks/mock/src/test/java/com/walmartlabs/concord/plugins/mock/VerifyTest.java
@@ -24,7 +24,11 @@
 import com.walmartlabs.concord.runtime.v2.runner.TestRuntimeV2;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Execution;
 
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
+
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class VerifyTest {
 
     @RegisterExtension
diff --git a/plugins/tasks/smtp/src/test/java/com/walmartlabs/concord/plugins/smtp/SmtpTaskTest.java b/plugins/tasks/smtp/src/test/java/com/walmartlabs/concord/plugins/smtp/SmtpTaskTest.java
@@ -27,6 +27,7 @@
 import com.walmartlabs.concord.sdk.MockContext;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Execution;
 
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
@@ -37,8 +38,10 @@
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
 @SuppressWarnings("deprecation")
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class SmtpTaskTest {
 
     @RegisterExtension
diff --git a/plugins/tasks/smtp/src/test/java/com/walmartlabs/concord/plugins/smtp/SmtpTaskV2Test.java b/plugins/tasks/smtp/src/test/java/com/walmartlabs/concord/plugins/smtp/SmtpTaskV2Test.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Execution;
 
 import javax.mail.internet.MimeMessage;
 import java.nio.file.Paths;
@@ -36,9 +37,11 @@
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class SmtpTaskV2Test {
 
     @RegisterExtension
diff --git a/runtime/v2/runner-test/src/test/java/com/walmartlabs/concord/runtime/v2/runner/LogExceptionsTest.java b/runtime/v2/runner-test/src/test/java/com/walmartlabs/concord/runtime/v2/runner/LogExceptionsTest.java
@@ -23,11 +23,14 @@
 import com.walmartlabs.concord.runtime.v2.sdk.ProcessConfiguration;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Execution;
 
 import static com.walmartlabs.concord.runtime.v2.runner.TestRuntimeV2.*;
 import static java.util.regex.Pattern.quote;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class LogExceptionsTest {
 
     @RegisterExtension
diff --git a/runtime/v2/runner-test/src/test/java/com/walmartlabs/concord/runtime/v2/runner/LogSegmentsTest.java b/runtime/v2/runner-test/src/test/java/com/walmartlabs/concord/runtime/v2/runner/LogSegmentsTest.java
@@ -28,6 +28,7 @@
 import com.walmartlabs.concord.runtime.v2.sdk.ProcessConfiguration;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Execution;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -40,7 +41,9 @@
 import static com.walmartlabs.concord.runtime.v2.runner.TestRuntimeV2.assertMultiLineLog;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
+@Execution(SAME_THREAD) // TODO address parallelism issues
 public class LogSegmentsTest {
 
     @RegisterExtension

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,12 @@ public static ConcordRule configure() {`
`60`	`60`	`.useLocalMavenRepository(true)`
`61`	`61`	`.extraConfigurationSupplier(() -> """`
`62`	`62`	`concord-agent {`
	`63`	`+ workersCount = 8`
`63`	`64`	`dependencyResolveTimeout = "30 seconds"`
`64`	`65`	`logMaxDelay = "250 milliseconds"`
`65`	`66`	`pollInterval = "250 milliseconds"`
`66`	`67`	`prefork {`
`67`		`- enabled = true`
	`68`	`+ enabled = false`
`68`	`69`	`}`
`69`	`70`	`}`
`70`	`71`	`""");`