diff --git a/integration-tests/run.sh b/integration-tests/run.sh index 716b60288e9618c3e6f6f656286dd8c8d3cf4de8..2f5b78c9a5d32c486a117b5ac50baa2a444c6d23 100755 --- a/integration-tests/run.sh +++ b/integration-tests/run.sh @@ -455,6 +455,9 @@ function generate_test_data { echo Generate incoming data local DIR=$DATA/in-raw + # drop a file + echo hello world > $DATA/incoming-a/3VCP1.txt + # drop an identifyable valid data set copy_test_data 3VCP1 $DIR sleep 30 @@ -541,6 +544,7 @@ function switch_dmv { function switch_processing_pipeline { new_state=$1 switch_dss $new_state datastore_server1 + sleep 1 switch_dss $new_state datastore_server2 switch_dmv $new_state datamover-analysis switch_sth $new_state dummy-img-analyser start.sh stop.sh $TRUE diff --git a/integration-tests/templates/datastore_server2/etc/service.properties b/integration-tests/templates/datastore_server2/etc/service.properties index 652218d23eb46fd6a59542cd2fd91f8d1f63d370..7ae125a4cee1ca5f8cbf06776bd0633d7351abb6 100644 --- a/integration-tests/templates/datastore_server2/etc/service.properties +++ b/integration-tests/templates/datastore_server2/etc/service.properties @@ -76,6 +76,7 @@ a.incoming-data-completeness-condition = auto-detection a.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor # Separator used to extract the barcode in the data set file name a.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator} +a.data-set-info-extractor.strip-file-extension = true a.data-set-info-extractor.group-code = CISD a.type-extractor = ch.systemsx.cisd.etlserver.SimpleTypeExtractor a.type-extractor.file-format-type = TIFF