summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-07-05 16:39:50 -0400
committerMonty Taylor <mordred@inaugust.com>2013-07-11 16:45:42 -0400
commita7901f74cd299e5a5784b07cc4bae6ca5abb2687 (patch)
treeb0c79d289934a43c951eb7e2998de89dc367b683 /tools
parentc5fa8f46bceb3c0e2ad1c4d247e7b84cd7c5081d (diff)
downloadpbr-a7901f74cd299e5a5784b07cc4bae6ca5abb2687.tar.gz
Don't try to install requirements repo.
Change-Id: I5c4c4a6128f9d71da9725160e62e74575f7cddae
Diffstat (limited to 'tools')
-rw-r--r--tools/integration.sh14
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/integration.sh b/tools/integration.sh
index f4be1d1..d4fafa5 100644
--- a/tools/integration.sh
+++ b/tools/integration.sh
@@ -41,8 +41,14 @@ mkdir -p $pypidir
jeepybvenv=$tmpdir/jeepyb
rm -f ~/.pip/pip.conf ~/.pydistutils.cfg
+mkdir -p ~/.pip
+
+cat <<EOF > ~/.pip/pip.conf
+[global]
+log = /home/jenkins/pip.log
+EOF
-mkvenv $jeepybvenv distribute pip
+mkvenv $jeepybvenv 'setuptools>=0.7' pip
$jeepybvenv/bin/pip install -U git+https://review.openstack.org/p/openstack-infra/jeepyb.git
cat <<EOF > $tmpdir/mirror.yaml
@@ -77,11 +83,11 @@ cat <<EOF > ~/.pydistutils.cfg
index_url = $pypiurl
EOF
-mkdir -p ~/.pip
cat <<EOF > ~/.pip/pip.conf
[global]
index-url = $pypiurl
extra-index-url = http://pypi.openstack.org/openstack
+log = /home/jenkins/pip.log
EOF
projectdir=$tmpdir/projects
@@ -98,6 +104,10 @@ for PROJECT in $PROJECTS ; do
# Tempest doesn't really install
continue
fi
+ if [ $SHORT_PROJECT = 'requirements' ]; then
+ # requirements doesn't really install
+ continue
+ fi
shortprojectdir=$projectdir/$SHORT_PROJECT
git clone $REPODIR/$SHORT_PROJECT $shortprojectdir