From ac22b6101873678ff0fbffbb3cfb9111b73b59fc Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Tue, 15 Jan 2013 15:03:59 +0000
Subject: [PATCH] SP-449 SWE-18: Improve parallel building on CI server (using
different ports for different projects)
SVN: 28108
---
.../QueryApiJsonDssServiceRpcGenericTest.java | 1 -
.../systemtests/SystemTestCase.java | 11 ++++++++++
.../shared/util/TestInstanceHostUtils.java | 21 +++++++++++++++++--
3 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryApiJsonDssServiceRpcGenericTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryApiJsonDssServiceRpcGenericTest.java
index cf38c44d1f7..2c6cecfcee5 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryApiJsonDssServiceRpcGenericTest.java
+++ b/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
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
index d6c51f3cfbe..8985fe68cc8 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
+++ b/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]);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TestInstanceHostUtils.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TestInstanceHostUtils.java
index 9f2ca09adf0..be7e70f2129 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TestInstanceHostUtils.java
+++ b/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;
+ }
}
--
GitLab