From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 3 May 2016 12:27:33 +0000 (-0400)
Subject: ceph-deploy-docs: use build_utils
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b25592b0fa741fe69565482ed236fbc571ecf1a5;p=ceph-build.git

ceph-deploy-docs: use build_utils

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

diff --git a/ceph-deploy-docs/build/build b/ceph-deploy-docs/build/build
index 643cb377..73e99b7a 100644
--- a/ceph-deploy-docs/build/build
+++ b/ceph-deploy-docs/build/build
@@ -2,24 +2,12 @@
 
 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[@]"
 
 # create the docs build with tox
-tox -rv -e docs
+$VENV/tox -rv -e docs
 
 # publish docs to http://docs.ceph.com/docs/ceph-deploy
 rsync -auv --delete .tox/docs/tmp/html/* /var/ceph-deploy/docs/