apt-get tweaks for the debian builds

- Try to update and upgrade twice (with a brief pause between attempts)
  to deal with occassional spurious server failures or repository race
  conditions.  Do the same for the main package install.
- Use dist-upgrade instead of upgrade for updating the image
- Add -q to the upgrade and install commands to make apt less verbose.
This commit is contained in:
Jason Rhinelander 2016-09-09 23:54:10 -04:00
parent 356bf94a85
commit bf14cea7c7

View File

@ -68,8 +68,7 @@ before_install:
--env="CC=$CC" --env="CXX=$CXX" --env="DEBIAN_FRONTEND=$DEBIAN_FRONTEND" \
--env=GCC_COLORS=\ \
$DOCKER)
docker exec --tty "$containerid" apt-get update
docker exec --tty "$containerid" apt-get -y upgrade
docker exec --tty "$containerid" sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
export SCRIPT_RUN_PREFIX="docker exec --tty $containerid"
else
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
@ -91,9 +90,9 @@ install:
- |
# Install dependencies
if [ -n "$DOCKER" ]; then
docker exec --tty "$containerid" apt-get -y --no-install-recommends install \
docker exec --tty "$containerid" sh -c "for s in 0 15; do sleep \$s; apt-get -qy --no-install-recommends install \
python$PYTHON-dev python$PY-pytest python$PY-scipy \
libeigen3-dev cmake make g++
libeigen3-dev cmake make g++ && break; done"
else
pip install numpy scipy pytest