From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 20 Nov 2015 20:31:16 +0000 (-0500)
Subject: use the new utility to install packages
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45360b031bf6cc423a3ed9aaa8aadc0f8cb1ad3b;p=ceph-build.git

use the new utility to install packages

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-deploy-pull-requests/build/setup b/ceph-deploy-pull-requests/build/setup
index 7e2eb023..46f976a1 100644
--- a/ceph-deploy-pull-requests/build/setup
+++ b/ceph-deploy-pull-requests/build/setup
@@ -1,24 +1,9 @@
 #!/bin/bash
 
-set -ex
+# the following two methods exist in scripts/build_utils.sh
+pkgs=( "ansible" "tox" )
+install_python_packages "pkgs[@]"
 
-# 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
-
-# The setup for this job ensures that a copy of ceph-build will be available
-# for this script
-
-# 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 ansible; then
-    venv/bin/pip install --exists-action=i --download-directory="$PIP_SDIST_INDEX" ansible
-    venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index ansible
-fi
 
 # run ansible to get this current host to meet our requirements, specifying
 # a local connection and 'localhost' as the host where to execute