summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorKonstantinos Natsakis <5933427+knatsakis@users.noreply.github.com>2019-11-01 11:38:25 +0200
committerGitHub <noreply@github.com>2019-11-01 11:38:25 +0200
commit2657f911421a8c4861abf8ebc3a51700bdf34524 (patch)
tree4681d2ffe9642cd449891d512035e6e29c20ec26 /.travis.yml
parent590c835f7dbbb51bc0976c4a0b86e581389166f3 (diff)
.travis.yml: Prevent nightly jobs from timing out (again) (#7238)
* .travis.yml: Add tick() and retry() functions * .travis.yml: Remove superfluous 'docker info' commands The docker info command is ran during the install phase. There is no need to run it again * .travis.yml: Use the tick() function instead of travis_wait()
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 050c6b4b7e..9d983645cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,8 @@ matrix:
allow_failures:
- env: ALLOW_SOFT_FAILURE_HERE=true
-
+before_install:
+ - source .travis/utils.sh
# Install dependencies for all, once
#
@@ -493,10 +494,9 @@ jobs:
- echo "Last commit:" && git log -1
- echo "GIT Describe:" && git describe
- echo "packaging/version:" && cat packaging/version
- - docker info
- packaging/docker/check_login.sh
&& echo "Switching to latest master branch, to pick up tagging if any" && git checkout master && git pull
- && travis_wait 20 packaging/docker/build.sh
+ && tick packaging/docker/build.sh
&& packaging/docker/publish.sh
after_failure: post_message "TRAVIS_MESSAGE" "<!here> Docker image publishing failed"
@@ -591,9 +591,8 @@ jobs:
- echo "Last commit:" && git log -1
- echo "GIT Describe:" && git describe
- echo "packaging/version:" && cat packaging/version
- - docker info
- packaging/docker/check_login.sh
- && travis_wait 20 packaging/docker/build.sh
+ && tick packaging/docker/build.sh
&& packaging/docker/publish.sh
after_failure: post_message "TRAVIS_MESSAGE" "<!here> Nightly docker image publish failed"