Skip to content

Commit 16a1828

Browse files
committed
Avoid clash with other venvs
This avoids picking up an arbitrary venv path which might be activated and overwrite that venv. Signed-off-by: Max Harmathy <[email protected]>
1 parent 2a84a2f commit 16a1828

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

openstack_workload_generator

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@ modification_time(){
77
python3 -c "import os; print(int(os.path.getmtime('$1')))"
88
}
99

10-
export VIRTUAL_ENV="${VIRTUAL_ENV:-${rundir}/venv}"
10+
export OWG_VIRTUAL_ENV="${OWG_VIRTUAL_ENV:-${rundir}/venv}"
1111

1212
create_env(){
1313
set -e
14-
rm -rf "${VIRTUAL_ENV}"
15-
python3 -m venv "${VIRTUAL_ENV}"
16-
source "${VIRTUAL_ENV}/bin/activate"
14+
rm -rf "${OWG_VIRTUAL_ENV}"
15+
python3 -m venv "${OWG_VIRTUAL_ENV}"
16+
source "${OWG_VIRTUAL_ENV}/bin/activate"
1717
pip install -r "${rundir}/requirements.txt"
18-
touch -r "${rundir}/requirements.txt" "${VIRTUAL_ENV}/bin/activate"
18+
touch -r "${rundir}/requirements.txt" "${OWG_VIRTUAL_ENV}/bin/activate"
1919
set +e
2020
}
2121

2222

23-
if ! [ -d "${VIRTUAL_ENV}" ] ;then
24-
echo "Creating venv: ${VIRTUAL_ENV}" >&2
23+
if ! [ -d "${OWG_VIRTUAL_ENV}" ] ;then
24+
echo "Creating venv: ${OWG_VIRTUAL_ENV}" >&2
2525
echo
2626
create_env
27-
elif [[ "$(modification_time "${rundir}/requirements.txt")" -gt "$(modification_time "${VIRTUAL_ENV}/bin/activate")" ]];then
28-
echo "Recreating venv: ${VIRTUAL_ENV}" >&2
27+
elif [[ "$(modification_time "${rundir}/requirements.txt")" -gt "$(modification_time "${OWG_VIRTUAL_ENV}/bin/activate")" ]];then
28+
echo "Recreating venv: ${OWG_VIRTUAL_ENV}" >&2
2929
echo
3030
create_env
3131
else
32-
source "${VIRTUAL_ENV}/bin/activate"
32+
source "${OWG_VIRTUAL_ENV}/bin/activate"
3333
fi
3434

3535

@@ -38,4 +38,4 @@ if [ "$1" = "deps" ];then
3838
fi
3939

4040
export PYTHONPATH="$rundir/src/"
41-
exec "${VIRTUAL_ENV}/bin/python" -m openstack_workload_generator "$@"
41+
exec "${OWG_VIRTUAL_ENV}/bin/python" -m openstack_workload_generator "$@"

0 commit comments

Comments
 (0)