From: Alfredo Deza Date: Tue, 3 May 2016 12:36:31 +0000 (-0400) Subject: teuthology-pull-requests: use build_utils X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=87fb61e8330a92820060da73a6699ffccd80e459;p=ceph-build.git teuthology-pull-requests: use build_utils Signed-off-by: Alfredo Deza --- diff --git a/teuthology-pull-requests/build/build b/teuthology-pull-requests/build/build index 061e65bc..48947738 100644 --- a/teuthology-pull-requests/build/build +++ b/teuthology-pull-requests/build/build @@ -2,22 +2,10 @@ set -ex -# Create the virtualenv -virtualenv venv -. venv/bin/activate - -# Define and ensure the PIP cache -PIP_SDIST_INDEX="$HOME/.cache/pip" -mkdir -p $PIP_SDIST_INDEX - -# Install the package by trying with the cache first, otherwise doing a download only, and then -# trying to install from the cache again. -if ! venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index tox; then - venv/bin/pip install --download-directory="$PIP_SDIST_INDEX" tox - venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index tox -fi - +# the following two methods exist in scripts/build_utils.sh +pkgs=( "tox" ) +install_python_packages "pkgs[@]" # run tox by recreating the environment and in verbose mode # by default this will run all environments defined -tox -rv +$VENV/tox -rv