SP-449 SWE-18: Improve parallel building on CI server (using different ports...

SP-449 SWE-18: Improve parallel building on CI server (using different ports for different projects)

SVN: 28108

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryApiJsonDssServiceRpcGenericTest.java

@@ -48,7 +48,6 @@ public class QueryApiJsonDssServiceRpcGenericTest extends AbstractQueryFacadeTes
         dssRpcService = JsonDssServiceRpcGenericTest.createDssRpcService();
 
         sessionToken = openbisService.tryToAuthenticateForAllServices("test", "1");
-
     }
 
     @Override

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java

@@ -16,7 +16,9 @@
 
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
+import static ch.systemsx.cisd.openbis.dss.generic.shared.utils.DssPropertyParametersUtil.DOWNLOAD_URL_KEY;
 import static ch.systemsx.cisd.openbis.dss.generic.shared.utils.DssPropertyParametersUtil.OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX;
+import static ch.systemsx.cisd.openbis.dss.generic.shared.utils.DssPropertyParametersUtil.SERVER_URL_KEY;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -184,6 +186,15 @@ public abstract class SystemTestCase extends AssertJUnit
                 + DssPropertyParametersUtil.DSS_REGISTRATION_LOG_DIR_PATH, getRegistrationLogDir()
                 .getAbsolutePath());
         System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX + "dss-rpc.put-default", "test");
+        System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX + SERVER_URL_KEY,
+                TestInstanceHostUtils.getOpenBISUrl());
+        System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX + "port",
+                Integer.toString(TestInstanceHostUtils.getDSSPort()));
+        System.setProperty(OPENBIS_DSS_SYSTEM_PROPERTIES_PREFIX + DOWNLOAD_URL_KEY,
+                TestInstanceHostUtils.getDSSUrl());
+        System.setProperty(SERVER_URL_KEY, TestInstanceHostUtils.getOpenBISUrl());
+        System.setProperty("port", Integer.toString(TestInstanceHostUtils.getDSSPort()));
+        System.setProperty(DOWNLOAD_URL_KEY, TestInstanceHostUtils.getDSSUrl());
 
         QueueingPathRemoverService.start(rootDir, ETLDaemon.shredderQueueFile);
         DataStoreServer.main(new String[0]);

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TestInstanceHostUtils.java

@@ -25,7 +25,7 @@ public class TestInstanceHostUtils
 
     public static int getOpenBISPort()
     {
-        return 8888;
+        return 8800 + getProjectNumber() + 8;
     }
 
     public static String getOpenBISUrl()
@@ -35,7 +35,7 @@ public class TestInstanceHostUtils
 
     public static int getDSSPort()
     {
-        return 8889;
+        return 8800 + getProjectNumber() + 9;
     }
 
     public static String getDSSUrl()
@@ -43,4 +43,21 @@ public class TestInstanceHostUtils
         return OPENBIS_URL + ":" + getDSSPort();
     }
 
+    private static int getProjectNumber()
+    {
+        String projectName = System.getProperty("ant.project.name", "");
+
+        if (projectName.equals("openbis"))
+        {
+            return 0;
+        } else if (projectName.equals("datastore_server"))
+        {
+            return 10;
+        } else if (projectName.equals("screening"))
+        {
+            return 20;
+        }
+
+        return 80;
+    }
 }