From 80b7682f899f1ecd4643eb011f7317da2eb2755f Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 20 Dec 2018 23:26:15 +0100 Subject: [PATCH] Speed up Docker pull tests and be easy on network usage --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5400c340..1a7f4a36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -197,16 +197,16 @@ env: ### install: # Update Debian/Ubuntu package index - - if [ "${S1}" != "DOCUMENTATION" ]; then - until sudo apt-get update -qq; do sleep 1; done + - if [ "${S1}" != "DOCUMENTATION" ] && [ "${S1}" != "UPDATE" ]; then + until sudo apt-get update -qq; do sleep 5; done fi # Install dependencies for documentation - if [ "${S1}" = "DOCUMENTATION" ]; then - until pip install sphinx; do sleep 1; done; - until pip install sphinx-autobuild; do sleep 1; done; - until pip install recommonmark; do sleep 1; done; - until pip install sphinx_rtd_theme; do sleep 1; done; + until pip install sphinx; do sleep 5; done; + until pip install sphinx-autobuild; do sleep 5; done; + until pip install recommonmark; do sleep 5; done; + until pip install sphinx_rtd_theme; do sleep 5; done; fi # Determine latest Docker version in apt @@ -228,9 +228,9 @@ install: echo "${COMPOSE_VERSION}"; # Install Docker and Docker Compose - - if [ "${S1}" != "DOCUMENTATION" ]; then - until sudo apt-get -y -qq -o Dpkg::Options::="--force-confnew" install docker-ce${DOCKER_APT}; do sleep 1; done; - until curl -L -sS --retry 100 --retry-max-time 0 https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose; do sleep 1; done; + - if [ "${S1}" != "DOCUMENTATION" ] && [ "${S1}" != "UPDATE" ]; then + until sudo apt-get -y -qq -o Dpkg::Options::="--force-confnew" install docker-ce${DOCKER_APT}; do sleep 5; done; + until curl -L -sS https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose; do sleep 5; done; chmod +x docker-compose; sudo mv -f docker-compose /usr/local/bin; fi