Skip to content

Commit 0b5393e

Browse files
authored
Fix fetching upload results (#239)
1 parent a4eff0e commit 0b5393e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tools/run_ci.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ if [[ "$BENCHMARK_STRATEGY" == "collection-reload" ]]; then
3737
export TELEMETRY_API_RESPONSE_FILE=$(ls -t results/telemetry-api-*.json | head -n 1)
3838
else
3939
# any other strategies are considered to have search & upload results
40-
export SEARCH_RESULTS_FILE=$(ls -t results/*-search-*.json | head -n 1)
41-
export UPLOAD_RESULTS_FILE=$(ls -t results/*-upload-*.json | head -n 1)
40+
export SEARCH_RESULTS_FILE=$(find results/ -type f -name '*-search-*.json' -printf '%T@ %p\n' | sort -nr | head -n 1 | cut -d' ' -f2-)
41+
export UPLOAD_RESULTS_FILE=$(find results/ -type f -name '*-upload-*.json' -printf '%T@ %p\n' | sort -nr | head -n 1 | cut -d' ' -f2-)
4242

4343
if [[ "$BENCHMARK_STRATEGY" == "parallel" ]]; then
4444
export PARALLEL_UPLOAD_RESULTS_FILE=$(ls -t results/parallel/*-upload-*.json | head -n 1)

tools/run_client_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ result_files_arr=()
5656
result_parallel_files_arr=()
5757

5858
if [[ "$EXPERIMENT_MODE" == "full" ]] || [[ "$EXPERIMENT_MODE" == "upload" ]]; then
59-
UPLOAD_RESULT_FILE=$(ssh -o ServerAliveInterval=10 -o ServerAliveCountMax=10 "${SERVER_USERNAME}@${IP_OF_THE_CLIENT}" "ls -t results/*-upload-*.json | head -n 1")
59+
UPLOAD_RESULT_FILE=$(ssh -o ServerAliveInterval=10 -o ServerAliveCountMax=10 "${SERVER_USERNAME}@${IP_OF_THE_CLIENT}" "find results/ -type f -name '*-upload-*.json' -printf '%T@ %p\n' | sort -nr | head -n 1 | cut -d' ' -f2-")
6060
result_files_arr+=("$UPLOAD_RESULT_FILE")
6161
fi
6262

0 commit comments

Comments
 (0)