From a03db72b39e89a55381a1dcc69da58b9e1128bb0 Mon Sep 17 00:00:00 2001 From: Patrick Nawracay Date: Fri, 15 Mar 2019 10:21:52 +0000 Subject: [PATCH] mgr/dashboard: Fix env vars of `run-tox.sh` Fixes: http://tracker.ceph.com/issues/38798 Signed-off-by: Patrick Nawracay (cherry picked from commit 5dee0b6a87753d8b7ff295f9a29c6eb407d17ccd) --- src/pybind/mgr/dashboard/run-tox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pybind/mgr/dashboard/run-tox.sh b/src/pybind/mgr/dashboard/run-tox.sh index 33a7db0cef274..412754656494d 100755 --- a/src/pybind/mgr/dashboard/run-tox.sh +++ b/src/pybind/mgr/dashboard/run-tox.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash # run from ./ or from ../ +: ${CEPH_BUILD_DIR:=$PWD/.tox} : ${MGR_DASHBOARD_VIRTUALENV:=$CEPH_BUILD_DIR/mgr-dashboard-virtualenv} : ${WITH_PYTHON2:=ON} : ${WITH_PYTHON3:=ON} -: ${CEPH_BUILD_DIR:=$PWD/.tox} test -d dashboard && cd dashboard if [ -e tox.ini ]; then -- 2.39.5