From 42efd270f986550832ca48873af447a1e1fcc76b Mon Sep 17 00:00:00 2001 From: kennytm Date: Fri, 10 Aug 2018 02:09:29 +0800 Subject: [PATCH 1/3] Revert "Auto merge of #53134 - alexcrichton:tweak-travis, r=Mark-Simulacrum" This reverts commit f9b9b6e078aa81c0faa064bf861e88001684765c, reversing changes made to 45a9d410f934247256812eda55ca66dd6999b3de. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7251a46cc5878..e13d120898764 100644 --- a/.travis.yml +++ b/.travis.yml @@ -278,8 +278,6 @@ after_success: du . | sort -nr | head -n100 after_failure: - # Requested by travis to debug "shutting down NOW" errors - - sudo tail -n 500 /var/log/syslog - > echo "#### Build failed; Disk usage after running script:"; df -h; From 53837db0019248f947c93164868828debed170bb Mon Sep 17 00:00:00 2001 From: kennytm Date: Fri, 10 Aug 2018 02:13:15 +0800 Subject: [PATCH 2/3] Revert "Auto merge of #53035 - alexcrichton:debug-travis, r=kennytm" This reverts commit 579adf8c727861841b4819b4913385c2782977fb, reversing changes made to c11f2d286c747b44f8e03ce10f6daa36f5d8331c. --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e13d120898764..2a5f755ebff3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -218,10 +218,6 @@ before_install: echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json; sudo service docker restart; fi - - date - - sudo atq || true - - sudo grep -rE 'shutdown|poweroff|halt' /var/spool/cron || true - - sudo grep -E 'google-clock-skew|ntpd|startup-script' /var/log/syslog || true install: - case "$TRAVIS_OS_NAME" in From b75f1bade0b108f79ac6025f27aeb6937759673b Mon Sep 17 00:00:00 2001 From: kennytm Date: Thu, 16 Aug 2018 20:06:55 +0800 Subject: [PATCH 3/3] Revert "Use public DNS server instead of 169.254.169.254 on CI." This reverts commit 32e8bda4e35ada92beab7236d62520e6c6df8596. --- src/ci/docker/run.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index b1ee636644ec7..3a7714d32fa17 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -119,10 +119,6 @@ fi # goes ahead and sets it for all builders. args="$args --privileged" -if [ "$CI" != "" ]; then - args="$args --dns 8.8.8.8 --dns 8.8.4.4 --dns 1.1.1.1 --dns 1.0.0.1" -fi - exec docker \ run \ --volume "$root_dir:/checkout:ro" \