Tests: Make container count to be configurable (#1655)

prebid · Dec 30, 2021 · 74a86c2 · 74a86c2
1 parent c6a298f
commit 74a86c2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/pr-functional-tests.yml b/.github/workflows/pr-functional-tests.yml
@@ -36,4 +36,4 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Build with Maven
-        run: mvn -B verify -DskipUnitTests=true --file extra/pom.xml
+        run: mvn -B verify -DskipUnitTests=true -Dmax.containers.count=5 --file extra/pom.xml
diff --git a/pom.xml b/pom.xml
@@ -748,6 +748,7 @@
                         <allure.results.directory>target/allure-results</allure.results.directory>
                         <mockserver.version>${mockserver-client.version}</mockserver.version>
                         <pbs.version>${project.version}</pbs.version>
+                        <max.containers.count>2</max.containers.count>
                     </systemPropertyVariables>
                 </configuration>
                 <executions>

diff --git a/src/test/groovy/org/prebid/server/functional/testcontainers/Dependencies.groovy b/src/test/groovy/org/prebid/server/functional/testcontainers/Dependencies.groovy
@@ -2,13 +2,15 @@ package org.prebid.server.functional.testcontainers
 
 import org.prebid.server.functional.testcontainers.container.NetworkServiceContainer
 import org.prebid.server.functional.util.ObjectMapperWrapper
+import org.prebid.server.functional.util.PBSUtils
 import org.testcontainers.containers.MySQLContainer
 import org.testcontainers.containers.Network
 import org.testcontainers.lifecycle.Startables
 
 class Dependencies {
 
-    private static final Boolean IS_LAUNCH_CONTAINERS = Boolean.valueOf(System.getProperty("launchContainers"))
+    private static final Boolean IS_LAUNCH_CONTAINERS = Boolean.valueOf(
+            PBSUtils.getPropertyOrDefault("launchContainers", "false"))
 
     static final ObjectMapperWrapper objectMapperWrapper = new ObjectMapperWrapper()
 

diff --git a/src/test/groovy/org/prebid/server/functional/testcontainers/PbsServiceFactory.groovy b/src/test/groovy/org/prebid/server/functional/testcontainers/PbsServiceFactory.groovy
@@ -4,11 +4,13 @@ import org.prebid.server.functional.service.PrebidServerService
 import org.prebid.server.functional.testcontainers.container.NetworkServiceContainer
 import org.prebid.server.functional.testcontainers.container.PrebidServerContainer
 import org.prebid.server.functional.util.ObjectMapperWrapper
+import org.prebid.server.functional.util.PBSUtils
 
 class PbsServiceFactory {
 
     private static final Map<Map<String, String>, PrebidServerContainer> containers = [:]
-    private static final int MAX_CONTAINERS_COUNT = 5
+    private static final int MAX_CONTAINERS_COUNT = Integer.parseInt(
+            PBSUtils.getPropertyOrDefault("max.containers.count", "2"))
 
     private final ObjectMapperWrapper mapper
     private final NetworkServiceContainer networkServiceContainer

diff --git a/src/test/groovy/org/prebid/server/functional/util/PBSUtils.groovy b/src/test/groovy/org/prebid/server/functional/util/PBSUtils.groovy
@@ -50,4 +50,8 @@ class PBSUtils {
         }
         path
     }
+
+    static String getPropertyOrDefault(String property, String defaultValue) {
+        System.getProperty(property) ?: defaultValue
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,4 +50,8 @@ class PBSUtils { @@
             }
             path
         }
+        static String getPropertyOrDefault(String property, String defaultValue) {
+            System.getProperty(property) ?: defaultValue
+        }
     }