diff options
author | Jun Aruga <junaruga@users.noreply.github.com> | 2020-01-07 04:23:04 +0100 |
---|---|---|
committer | NARUSE, Yui <nurse@users.noreply.github.com> | 2020-01-07 12:23:04 +0900 |
commit | f132825ffa1c225b0055ce6b0aa0d8428fba2623 (patch) | |
tree | 083742d1ebea121a1f24d08b5d53e3990465e533 | |
parent | b0bf654c3164e9c6b5b38aa6fe23bd76d28a38d2 (diff) |
Disable IPv6 on Travis s390x case. (#2819)
This fixes following error that sometimes happens once in a few times
on Travis s390x environment.
```
$ tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+ sudo -E apt-add-repository -y ppa:ubuntu-toolchain-r/test
Error: retrieving gpg key timed out.
```
-rw-r--r-- | .travis.yml | 9 | ||||
-rwxr-xr-x | tool/travis_disable_ipv6.sh | 11 |
2 files changed, 18 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index fbcfe18d3d..8b09d0cae9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ env: - RUBY_PREFIX=/tmp/ruby-prefix - GEMS_FOR_TEST='timezone tzinfo' - UPDATE_UNICODE="UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=." + - BEFORE_INSTALL=true # https://github.com/travis-ci/travis-build/blob/e411371dda21430a60f61b8f3f57943d2fe4d344/lib/travis/build/bash/travis_apt_get_options.bash#L7 - travis_apt_get_options='--allow-downgrades --allow-remove-essential --allow-change-held-packages' - travis_apt_get_options="-yq --no-install-suggests --no-install-recommends $travis_apt_get_options" @@ -68,10 +69,10 @@ env: # sources: # - ubuntu-toolchain-r-test before_install: + - bash -cx "${BEFORE_INSTALL}" - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq" - |- - ${BEFORE_INSTALL} tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \ ccache \ gcc-8 \ @@ -132,7 +133,9 @@ env: name: s390x-linux arch: s390x <<: *gcc-8 - + env: + - BEFORE_INSTALL="tool/travis_disable_ipv6.sh" + - &jemalloc name: --with-jemalloc <<: *gcc-8 @@ -453,6 +456,8 @@ before_script: - echo JOBS=${JOBS} SETARCH=${SETARCH} - $SETARCH uname -a - $SETARCH uname -r + - ip a + - cat /etc/hosts - rm -fr .ext autom4te.cache - echo $TERM - |- diff --git a/tool/travis_disable_ipv6.sh b/tool/travis_disable_ipv6.sh new file mode 100755 index 0000000000..97ba179d6e --- /dev/null +++ b/tool/travis_disable_ipv6.sh @@ -0,0 +1,11 @@ +#!/bin/bash +set -ex +ip a +sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1 +sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1 +sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=1 +ip a + +cat /etc/hosts +sudo ruby -e "hosts = File.read('/etc/hosts').sub(/^::1\s*localhost.*$/, ''); File.write('/etc/hosts', hosts)" +cat /etc/hosts |