diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-10-31 13:44:51 -0400 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2013-10-31 13:44:51 -0400 |
| commit | 61d73c028ec5ca1358466f3b2adaffe608d3061f (patch) | |
| tree | fa679bb9c5e05aee0912c962db6c858443b41b7d | |
| parent | e8a3c7e7ba4430870849ff34ab3437db2ed1f942 (diff) | |
| download | pbr-61d73c028ec5ca1358466f3b2adaffe608d3061f.tar.gz | |
Use pypi-mirror instead of jeepyb
Change-Id: I56dffb73526bd56ac544d320d9d6f2baa6175a2a
| -rw-r--r-- | tools/integration.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/integration.sh b/tools/integration.sh index 3ff2cd9..b94cc19 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -35,7 +35,7 @@ mkdir -p $tmpdownload pypidir=$tmpdir/pypi mkdir -p $pypidir -jeepybvenv=$tmpdir/jeepyb +pypimirrorvenv=$tmpdir/pypi-mirror sudo touch $HOME/pip.log sudo chown $USER $HOME/pip.log @@ -47,11 +47,11 @@ cat <<EOF > ~/.pip/pip.conf log = $HOME/pip.log EOF -jeepybsourcedir=$tmpdir/jeepybsourcedir -git clone $REPODIR/jeepyb $jeepybsourcedir +pypimirrorsourcedir=$tmpdir/pypimirrorsourcedir +git clone $REPODIR/pypi-mirror $pypimirrorsourcedir -mkvenv $jeepybvenv setuptools pip -$jeepybvenv/bin/pip install -e $jeepybsourcedir +mkvenv $pypimirrorvenv setuptools pip +$pypimirrorvenv/bin/pip install -e $pypimirrorsourcedir cat <<EOF > $tmpdir/mirror.yaml cache-root: $tmpdownload @@ -70,14 +70,14 @@ pbrsdistdir=$tmpdir/pbrsdist git clone $REPODIR/pbr $pbrsdistdir cd $pbrsdistdir -$jeepybvenv/bin/run-mirror -b remotes/origin/master --verbose -c $tmpdir/mirror.yaml --no-process +$pypimirrorvenv/bin/run-mirror -b remotes/origin/master --verbose -c $tmpdir/mirror.yaml --no-process -$jeepybvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack 'pip==1.0' 'setuptools>=0.7' +$pypimirrorvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack 'pip==1.0' 'setuptools>=0.7' -$jeepybvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack -r requirements.txt -$jeepybvenv/bin/python setup.py sdist -d $tmpdownload/pip/openstack +$pypimirrorvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack -r requirements.txt +$pypimirrorvenv/bin/python setup.py sdist -d $tmpdownload/pip/openstack -$jeepybvenv/bin/run-mirror -b remotes/origin/master --verbose -c $tmpdir/mirror.yaml --no-download +$pypimirrorvenv/bin/run-mirror -b remotes/origin/master --verbose -c $tmpdir/mirror.yaml --no-download find $pypidir |