LMS-2612 DSS plugin distributions changed: Folder 'datastore_server'...

LMS-2612 DSS plugin distributions changed: Folder 'datastore_server' introduced, DSS core-plugins added.

SVN: 24559

integration-tests/test-screening.sh

@@ -71,7 +71,7 @@ function install_dss_screening {
 
 		rm -fr $dss_dest
 		unzip -q $INSTALL/datastore_server-S*.zip -d $dss_dest
-		unzip -q $INSTALL/datastore_server_plugin-screening*.zip -d $dss_dest/datastore_server
+		unzip -q $INSTALL/datastore_server_plugin-screening*.zip -d $dss_dest
 		unzip -qo $INSTALL/datastore_server-screening*.zip -d $dss_dest datastore_server/etc/service.properties
 		mv $dss_dest/datastore_server/* $dss_dest
 		rmdir $dss_dest/datastore_server

integration-tests/test-yeastx.sh

@@ -29,6 +29,7 @@ function prepare_data {
 
 function build_and_install_yeastx {
 		unzip -u $INSTALL/datastore_server_plugin-yeastx-*.zip -d $WORK/datastore_server_yeastx
+		mv $WORK/datastore_server_yeastx/datastore_server/lib/* $WORK/datastore_server_yeastx/lib
 		chmod_exec $WORK/datastore_server_yeastx/takeCifsOwnershipRecursive.sh
 		
 		prepare_data