Rollup merge of #53234 - kennytm:debug-9696, r=alexcrichton

Remove Travis shutdown debug scripts, and remove CI-specific DNS settings

Since the cause of the host shutdown (travis-ci/travis-ci#4924) is found, we could revert the shutdown debug attempts to shorten the logs.

Additionally, we're pretty sure a custom DNS (added in  will not help travis-ci/travis-ci#9696, so reverting that part of #51420 to reduce CI-specific settings.
This commit is contained in:
kennytm 2018-08-17 00:54:45 +08:00
commit a68e61a9f2
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
2 changed files with 0 additions and 10 deletions

View File

@ -218,10 +218,6 @@ before_install:
echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json; echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json;
sudo service docker restart; sudo service docker restart;
fi 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: install:
- case "$TRAVIS_OS_NAME" in - case "$TRAVIS_OS_NAME" in
@ -278,8 +274,6 @@ after_success:
du . | sort -nr | head -n100 du . | sort -nr | head -n100
after_failure: 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:"; echo "#### Build failed; Disk usage after running script:";
df -h; df -h;

View File

@ -119,10 +119,6 @@ fi
# goes ahead and sets it for all builders. # goes ahead and sets it for all builders.
args="$args --privileged" 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 \ exec docker \
run \ run \
--volume "$root_dir:/checkout:ro" \ --volume "$root_dir:/checkout:ro" \