From: Loic Dachary <ldachary@redhat.com>
Date: Fri, 8 May 2015 06:57:24 +0000 (+0200)
Subject: tests: pip must not log in $HOME/.pip
X-Git-Tag: v9.0.2~212^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b28a6fd87d1c50939918875b8fc9f97019e4cd0;p=ceph.git

tests: pip must not log in $HOME/.pip

Because it may not have permission to when running in a container and
scripts run from source are not expected to modify anything outside of
the source tree anyway.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/install-deps.sh b/install-deps.sh
index dbc720b8772b..3710707d5732 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -92,7 +92,7 @@ for interpreter in python2.7 python3 ; do
     rm -fr install-deps
     virtualenv --python $interpreter install-deps
     . install-deps/bin/activate
-    pip install wheel
+    pip --log install-deps/log.txt install wheel
     find . -name tox.ini | while read ini ; do
         (
             cd $(dirname $ini)
@@ -100,7 +100,7 @@ for interpreter in python2.7 python3 ; do
             if test "$require" ; then
                 # although pip comes with virtualenv, having a recent version
                 # of pip matters when it comes to using wheel packages
-                pip wheel $require 'distribute >= 0.7' 'pip >= 6.1'
+                pip --log install-deps/log.txt wheel $require 'distribute >= 0.7' 'pip >= 6.1'
             fi
         )
     done
diff --git a/src/ceph-detect-init/run-tox.sh b/src/ceph-detect-init/run-tox.sh
index 3d7216cc8897..2f0e62b7757f 100755
--- a/src/ceph-detect-init/run-tox.sh
+++ b/src/ceph-detect-init/run-tox.sh
@@ -24,10 +24,10 @@ virtualenv make-check
 . make-check/bin/activate
 # older versions of pip will not install wrap_console scripts
 # when using wheel packages
-pip install --upgrade 'pip >= 6.1'
+pip --log make-check/log.txt install --upgrade 'pip >= 6.1'
 if test -d wheelhouse ; then
     export NO_INDEX=--no-index
 fi
-pip install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse --upgrade distribute
-pip install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse 'tox >=1.9' 
+pip --log make-check/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse --upgrade distribute
+pip --log make-check/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse 'tox >=1.9' 
 tox 2>&1 | grep -v InterpreterNotFound
diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh
index dca322f9b070..d6cceb38a0e6 100755
--- a/src/test/ceph-disk.sh
+++ b/src/test/ceph-disk.sh
@@ -27,7 +27,7 @@ virtualenv virtualenv-$DIR
     if test -d ceph-detect-init/wheelhouse ; then
         wheelhouse="--no-index --use-wheel --find-links=ceph-detect-init/wheelhouse"
     fi
-    pip install $wheelhouse --editable ceph-detect-init
+    pip --log virtualenv-$DIR/log.txt install $wheelhouse --editable ceph-detect-init
 )
 OSD_DATA=$DIR/osd
 MON_ID=a
diff --git a/src/test/run-cli-tests b/src/test/run-cli-tests
index e29ad2086aec..48fc90e61a28 100755
--- a/src/test/run-cli-tests
+++ b/src/test/run-cli-tests
@@ -30,7 +30,7 @@ if [ ! -e "$CRAM_BIN" ]; then
     # patched cram to support that. See upstream ticket at
     # https://bitbucket.org/brodie/cram/issue/9/allow-read-only-directories-for-t
     # -- tv@inktank.com
-    virtualenv "$VENV" && $VENV/bin/pip install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
+    virtualenv "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
 fi
 
 SRCDIR_ABS="$(readlink -f "$SRCDIR")"