From 9104d76c079ac1bc83bf86dfaee737c9136747a4 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Mon, 15 Dec 2014 10:46:47 +0000
Subject: [PATCH] SSDM-1286 : QGF: Setup of automatic testing of dropboxes -
set ant.project.name property as it is expected by TestInstanceHostUtils.
Without it all system tests on jenkins try to run openbis on the same port.
SVN: 33054
---
gradle/javaproject.gradle | 2 ++
.../openbis/generic/shared/util/TestInstanceHostUtils.java | 3 +++
2 files changed, 5 insertions(+)
diff --git a/gradle/javaproject.gradle b/gradle/javaproject.gradle
index ce458e66868..51364cbfad6 100644
--- a/gradle/javaproject.gradle
+++ b/gradle/javaproject.gradle
@@ -204,6 +204,8 @@ test {
useTestNG()
options.suites('sourceTest/java/tests.xml')
+ systemProperty "ant.project.name", project.name
+
jvmArgs '-Xmx2048m', '-XX:MaxPermSize=256m', '-Duser.timezone=Europe/Zurich'
testLogging.showStandardStreams = true
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 be7e70f2129..6ca69dad279 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
@@ -56,6 +56,9 @@ public class TestInstanceHostUtils
} else if (projectName.equals("screening"))
{
return 20;
+ } else if (projectName.equals("deep_sequencing_unit"))
+ {
+ return 30;
}
return 80;
--
GitLab