From 21eb2ac739ad3676413ac5b9e6a39744c28539a2 Mon Sep 17 00:00:00 2001 From: Arthur Meyre Date: Mon, 13 Dec 2021 16:15:32 +0100 Subject: [PATCH] chore: fix benchmarks script --- Makefile | 5 ++++- .../benchmark_and_publish_findings_in_docker.sh | 14 ++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 837ae961d..9d78a8b81 100644 --- a/Makefile +++ b/Makefile @@ -194,7 +194,10 @@ docker_publish_measurements: docker_build @# Poetry is not installed on the benchmark servers @# Thus, we ran `extract_machine_info.py` script using native python python script/progress_tracker_utils/extract_machine_info.py - docker run --rm --volume /"$$(pwd)":/src $(DEV_DOCKER_IMG) \ + docker run --rm --volume /"$$(pwd)":/src \ + --volume $(DEV_CONTAINER_VENV_VOLUME):/home/dev_user/dev_venv \ + --volume $(DEV_CONTAINER_CACHE_VOLUME):/home/dev_user/.cache \ + $(DEV_DOCKER_IMG) \ /bin/bash ./script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh .PHONY: docs # Build docs diff --git a/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh b/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh index 0bc430da7..2670edb52 100755 --- a/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh +++ b/script/progress_tracker_utils/benchmark_and_publish_findings_in_docker.sh @@ -3,13 +3,15 @@ # Run benchmarks while logging the intermediate results # Publish findings in the progress tracker -set +e +set -e -# shellcheck disable=SC1091 -if ! source /root/dev_venv/bin/activate; then - python3 -m venv /root/dev_venv - # shellcheck disable=SC1091 - source /root/dev_venv/bin/activate +DEV_VENV_PATH="/home/dev_user/dev_venv" + +# shellcheck disable=SC1090,SC1091 +if ! source "${DEV_VENV_PATH}/bin/activate"; then + python3 -m venv "${DEV_VENV_PATH}" + # shellcheck disable=SC1090,SC1091 + source "${DEV_VENV_PATH}/bin/activate" cd /src/ && make setup_env fi