From 86ca640287eccc8426b87903cac1ec428d7ede8b Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 18 Mar 2020 14:31:11 +0100 Subject: Enablie IPv6 on Travis s390s case again. It seems the issue was fixed by Travis. See https://travis-ci.community/t/6719/5 . --- .travis.yml | 2 -- tool/travis_disable_ipv6.sh | 11 ----------- 2 files changed, 13 deletions(-) delete mode 100755 tool/travis_disable_ipv6.sh diff --git a/.travis.yml b/.travis.yml index ab2edd1f96..e26fe1dc16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -133,8 +133,6 @@ env: name: s390x-linux arch: s390x <<: *gcc-8 - env: - - BEFORE_INSTALL="tool/travis_disable_ipv6.sh" - &jemalloc name: --with-jemalloc diff --git a/tool/travis_disable_ipv6.sh b/tool/travis_disable_ipv6.sh deleted file mode 100755 index 97ba179d6e..0000000000 --- a/tool/travis_disable_ipv6.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/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 -- cgit v1.2.3