fix: integration tests

SVN: 12486

integration-tests/run.sh

@@ -61,7 +61,7 @@ function run_lsof {
 # Tries to find PostgreSQL executable and returns its absolute path.
 # If not found, then exits the script with an appropriate error message.
 function run_psql {
-	for prg in psql psql82 psql83; do
+	for prg in psql psql84 psql83; do
 		exe=`locate_file $prg $BIN_PATHS`
 		if [ $exe ]; then
 			echo $exe
@@ -209,7 +209,7 @@ function install_openbis_server {
     local install_openbis=$1
     psql_cmd=`run_psql`
     $psql_cmd -U postgres -c "drop database $DATABASE"
-    $psql_cmd -U postgres -c "create database $DATABASE with owner $USER encoding = 'UNICODE'"
+    $psql_cmd -U postgres -c "create database $DATABASE with owner $USER template = template0 encoding = 'UNICODE'"
     $psql_cmd -U $USER -d $DATABASE -f $TEMPLATE/$OPENBIS_SERVER_NAME/test_database.sql
 
     if [ $install_openbis == "true" ]; then
@@ -851,4 +851,4 @@ else
 	 shift
     done
     integration_tests $install_dss $install_dmv $install_openbis $use_local_source $reinstall_all
-fi
+fi
\ No newline at end of file

integration-tests/templates/datastore_server1/etc/service.properties

@@ -4,6 +4,9 @@ data-store-server-code = DSS1
 # The root directory of the data store
 storeroot-dir = ../data/main-store
 
+# The directory where the command queue file is located; defaults to storeroot-dir 
+commandqueue-dir =
+
 # Port
 port = 8444
 

integration-tests/templates/datastore_server2/etc/service.properties

@@ -4,6 +4,9 @@ data-store-server-code = DSS2
 # The root directory of the data store
 storeroot-dir = ../data/main-store
 
+# The directory where the command queue file is located; defaults to storeroot-dir 
+commandqueue-dir =
+
 # Port
 port = 8445
 

integration-tests/templates/openBIS-server/openbis.conf

@@ -15,4 +15,4 @@ JAVA_OPTS=${JAVA_OPTS:=-server -Djavax.net.ssl.trustStore=openBIS.keystore}
 #
 # Memory options to the JRE
 #
-JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m"
+JAVA_MEM_OPTS="-Xmx512m -Xms512m -XX:MaxPermSize=256m"