summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGitelman, Tal (tg851x) <tg851x@intl.att.com>2018-03-19 19:07:30 +0200
committerGitelman, Tal (tg851x) <tg851x@intl.att.com>2018-03-19 19:09:17 +0200
commit19c9bdace397ae740f17aa4739caf9c211833b4c (patch)
tree42e79b8e8155a23cc70cc2eced89a0d93b8425d3
parenta5ce6e4de3dacfac916cfc3b3270a0d7f190b632 (diff)
Align current csit testing - fix CSIT tests
Change-Id: I453a6af8126540602cd98cc37580e75f67b86c16 Issue-ID: SDC-1097 Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
-rwxr-xr-xsdc-os-chef/scripts/docker_run.sh2
-rw-r--r--sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index d962e8e930..67deca8b3d 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -356,7 +356,7 @@ if [ -z "${DOCKER}" ]; then
sdc-init-es
sdc-cs
sdc-cs-init
- sdc-kbn
+# sdc-kbn
sdc-BE
sdc-BE-init
sdc-FE
diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh
index 76338b2082..35821dd24d 100644
--- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh
+++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh
@@ -93,7 +93,7 @@ if [ ${REMOTE_DEBUG} == "true" ]; then
JAVA_OPTION="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${debug_port}" ;
fi
-cmd="java $JAVA_OPTION -Xms1024m -Xmx1024m -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &"
+cmd="java $JAVA_OPTION -Xms512m -Xmx512m -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &"
if [ $DEBUG == "true" ]
@@ -108,7 +108,7 @@ if [ ${RERUN} == "true" ]; then
echo "Prepare" ${TARGET_DIR}/${fileName} "file to rerun all failed tests ...";
prepareFailedXmlFile ${TARGET_DIR}/${fileName} $SUITE_FILE;
SUITE_FILE=${fileName};
- cmd="java $JAVA_OPTION -Xms1024m -Xmx1024m -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &"
+ cmd="java $JAVA_OPTION -Xms512m -Xmx512m -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &"
$cmd;
fi
fi