Update

Signed-off-by: Jun Aruga <jaruga@redhat.com>
junaruga · Jan 6, 2020 · b2e7329 · b2e7329
1 parent 0932734
commit b2e7329
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -69,7 +69,7 @@ env:
     #     sources:
     #       - ubuntu-toolchain-r-test
     before_install:
-      - eval "${BEFORE_INSTALL}"
+      - ${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"
       - |-
@@ -134,12 +134,7 @@ env:
     arch: s390x
     <<: *gcc-8
     env:
-      - >-
-        BEFORE_INSTALL="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"
+      - 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
@@ -0,0 +1,7 @@
+#!/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