ceph-tag: use build_utils

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

diff --git a/ceph-tag/build/build b/ceph-tag/build/build
index a9969eb2f186885e990a2c58ddfe4c03d7388928..4fabef2da2f2c6cbe18976bb240085b24e3fdccf 100644 (file)
--- a/ceph-tag/build/build
+++ b/ceph-tag/build/build
@@ -7,25 +7,11 @@ if [ "$TAG" = false ] ; then
     exit 0
 fi
 
-# 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
+# the following two methods exist in scripts/build_utils.sh
+pkgs=( "ansible" )
+install_python_packages "pkgs[@]"
 
 # run ansible to do all the tagging and release specifying
 # a local connection and 'localhost' as the host where to execute
 cd "$WORKSPACE/ceph-build/ansible/"
-ansible-playbook -i "localhost," -c local release.yml --extra-vars="version=$VERSION branch=$BRANCH force_version=$FORCE_VERSION release=stable clean=true project=ceph"
+$VENV/ansible-playbook -i "localhost," -c local release.yml --extra-vars="version=$VERSION branch=$BRANCH force_version=$FORCE_VERSION release=stable clean=true project=ceph"