From 68527ab83a77d20b779759581ce0b8844991231b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 23 Nov 2019 01:14:15 +0800 Subject: [PATCH] mgr/dashboard: install teuthology using pip * install teuthology using pip * do not install the dependencies manually, it's error-prone to maintain two copies of requirements.txt Fixes: https://tracker.ceph.com/issues/42969 Signed-off-by: Kefu Chai --- .../mgr/dashboard/run-backend-api-tests.sh | 40 +------------------ 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/src/pybind/mgr/dashboard/run-backend-api-tests.sh b/src/pybind/mgr/dashboard/run-backend-api-tests.sh index 6447fa71af6..c7b9e3f07bc 100755 --- a/src/pybind/mgr/dashboard/run-backend-api-tests.sh +++ b/src/pybind/mgr/dashboard/run-backend-api-tests.sh @@ -56,49 +56,13 @@ setup_teuthology() { TEMP_DIR=`mktemp -d` cd $TEMP_DIR - cat < t_reqs.txt -apache-libcloud==2.2.1 -asn1crypto==0.22.0 -backports.ssl-match-hostname==3.5.0.1 -bcrypt==3.1.4 -certifi==2018.1.18 -cffi==1.10.0 -chardet==3.0.4 -configobj==5.0.6 -cryptography==2.1.4 -enum34==1.1.6 -gevent==1.2.2 -greenlet==0.4.13 -idna==2.5 -ipaddress==1.0.18 -Jinja2==2.9.6 -manhole==1.5.0 -MarkupSafe==1.0 -netaddr==0.7.19 -packaging==16.8 -paramiko==2.4.0 -pexpect==4.4.0 -psutil==5.4.3 -ptyprocess==0.5.2 -pyasn1==0.2.3 -pycparser==2.17 -PyNaCl==1.2.1 -pyparsing==2.2.0 -python-dateutil==2.6.1 -PyYAML==3.12 -requests==2.18.4 -six==1.10.0 -urllib3==1.22 -EOF - virtualenv --python=${TEUTHOLOGY_PYTHON_BIN:-/usr/bin/python} venv source venv/bin/activate pip install 'setuptools >= 12' - pip install -r t_reqs.txt + pip install git+https://github.com/ceph/teuthology#egg=teuthology[test] pushd $CURR_DIR pip install -r requirements.txt -c constraints.txt popd - git clone --depth 1 https://github.com/ceph/teuthology.git deactivate } @@ -161,7 +125,7 @@ run_teuthology_tests() { export PYBIND=$LOCAL_BUILD_DIR/src/pybind pybind_dir=$PYBIND fi - export PYTHONPATH=$TEMP_DIR/teuthology:$source_dir/qa:$LOCAL_BUILD_DIR/lib/cython_modules/lib.${CEPH_PY_VERSION_MAJOR}/:$pybind_dir:$python_common_dir:${COVERAGE_PATH} + export PYTHONPATH=$source_dir/qa:$LOCAL_BUILD_DIR/lib/cython_modules/lib.${CEPH_PY_VERSION_MAJOR}/:$pybind_dir:$python_common_dir:${COVERAGE_PATH} export RGW=${RGW:-1} export COVERAGE_ENABLED=true -- 2.39.5