diff --git a/tests/automatic/authorizer/check_authorize/check_linux.sh b/tests/automatic/authorizer/check_authorize/check_linux.sh index fde0324712c7a26ffbc5a61c698efd0d63d6ee41..5abecef9749ece0dc7f5cbd226640d966c5f0114 100644 --- a/tests/automatic/authorizer/check_authorize/check_linux.sh +++ b/tests/automatic/authorizer/check_authorize/check_linux.sh @@ -9,8 +9,8 @@ Cleanup() { echo "db.dropDatabase()" | mongo asapo_admin } -mkdir -p /tmp/asapo/asap3/petra3/gpfs/p00/2019/comissioning/c20180508-000-COM20181 -mkdir -p /tmp/asapo/asap3/petra3/gpfs/p00/2019/data/11000015 +mkdir -p /tmp/asapo/receiver/files/petra3/gpfs/p00/2019/comissioning/c20180508-000-COM20181 +mkdir -p /tmp/asapo/receiver/files/petra3/gpfs/p00/2019/data/11000015 mkdir -p /tmp/asapo/beamline/p07/current mkdir -p /tmp/asapo/beamline/p08/current cp beamtime-metadata-11111111.json /tmp/asapo/beamline/p07/current/ @@ -76,4 +76,4 @@ sleep 1 curl -v --silent --data "{\"SourceCredentials\":\"processed%instance%step%11000015%auto%detector%$token\",\"OriginHost\":\"bla\"}" 127.0.0.1:8400/asapo-authorizer/authorize --stderr - | tee /dev/stderr | grep 401 -rm -rf /tmp/asapo/asap3 /tmp/asapo/beamline \ No newline at end of file +rm -rf /tmp/asapo/receiver/files /tmp/asapo/beamline \ No newline at end of file diff --git a/tests/automatic/consumer/consumer_api_python/check_linux.sh b/tests/automatic/consumer/consumer_api_python/check_linux.sh index c6efb06f43e651db36e2385f63d1fd2053d10cb7..5a912611948ae322de245503945fa9e6cfa6be8a 100644 --- a/tests/automatic/consumer/consumer_api_python/check_linux.sh +++ b/tests/automatic/consumer/consumer_api_python/check_linux.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash beamtime_id=test_run -source_path=/tmp/asapo/asap3/petra3/gpfs/p01/2019/data/$beamtime_id +source_path=/tmp/asapo/receiver/files/petra3/gpfs/p01/2019/data/$beamtime_id data_source=detector database_name=${beamtime_id}_${data_source} token_test_run=$BT_TEST_RUN_RW_TOKEN diff --git a/tests/automatic/curl_http_client/curl_http_client_command/check_linux.sh b/tests/automatic/curl_http_client/curl_http_client_command/check_linux.sh index ceb5e87405f14d5d3122e483c7d11d30629709d2..4b94f3b81d865e0154d083452412e650d2dc6bcc 100644 --- a/tests/automatic/curl_http_client/curl_http_client_command/check_linux.sh +++ b/tests/automatic/curl_http_client/curl_http_client_command/check_linux.sh @@ -5,7 +5,7 @@ set -e trap Cleanup EXIT beamtime_id=aaa -file_transfer_folder=/tmp/asapo/asap3/petra3/gpfs/p01/2019/data/$beamtime_id +file_transfer_folder=/tmp/asapo/receiver/files/petra3/gpfs/p01/2019/data/$beamtime_id Cleanup() { echo cleanup diff --git a/tests/automatic/file_transfer_service/rest_api/check_linux.sh b/tests/automatic/file_transfer_service/rest_api/check_linux.sh index 11117a650eb454ae5e5b9ef2396e964e45562ecc..603feff6e52b87b340cd85714e3651ee01fa4a76 100644 --- a/tests/automatic/file_transfer_service/rest_api/check_linux.sh +++ b/tests/automatic/file_transfer_service/rest_api/check_linux.sh @@ -4,7 +4,7 @@ set -e trap Cleanup EXIT -file_transfer_folder=/tmp/asapo/asap3/petra3/gpfs/p01/2019/data/aaa +file_transfer_folder=/tmp/asapo/receiver/files/petra3/gpfs/p01/2019/data/aaa Cleanup() { diff --git a/tests/automatic/full_chain/simple_chain_raw/check_linux.sh b/tests/automatic/full_chain/simple_chain_raw/check_linux.sh index b28ced67aefb45bd8c2ab296f2bde6b6d634db0d..40819d75bcabaec241182b65c527b571f3b8613f 100644 --- a/tests/automatic/full_chain/simple_chain_raw/check_linux.sh +++ b/tests/automatic/full_chain/simple_chain_raw/check_linux.sh @@ -10,14 +10,14 @@ monitor_database_name=db_test proxy_address=127.0.0.1:8400 -mkdir -p /tmp/asapo/asap3/petra3/gpfs/p07/2019/data/11111111 -cp beamtime-metadata* /tmp/asapo/asap3/petra3/gpfs/p07/2019/data/11111111 +mkdir -p /tmp/asapo/receiver/files/petra3/gpfs/p07/2019/data/11111111 +cp beamtime-metadata* /tmp/asapo/receiver/files/petra3/gpfs/p07/2019/data/11111111 mkdir -p /tmp/asapo/beamline/p07/current cp beamtime-metadata* /tmp/asapo/beamline/p07/current/ Cleanup() { echo cleanup - rm -rf out /tmp/asapo/asap3 /tmp/asapo/beamline + rm -rf out /tmp/asapo/receiver/files /tmp/asapo/beamline echo "db.dropDatabase()" | mongo ${beamtime_id}_detector set +e