Skip to content

Commit a68e61a

Browse files
committed
Rollup merge of rust-lang#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 rust-lang#51420 to reduce CI-specific settings.
2 parents 1cb13b2 + b75f1ba commit a68e61a

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

.travis.yml

-6
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,6 @@ before_install:
218218
echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json;
219219
sudo service docker restart;
220220
fi
221-
- date
222-
- sudo atq || true
223-
- sudo grep -rE 'shutdown|poweroff|halt' /var/spool/cron || true
224-
- sudo grep -E 'google-clock-skew|ntpd|startup-script' /var/log/syslog || true
225221

226222
install:
227223
- case "$TRAVIS_OS_NAME" in
@@ -278,8 +274,6 @@ after_success:
278274
du . | sort -nr | head -n100
279275
280276
after_failure:
281-
# Requested by travis to debug "shutting down NOW" errors
282-
- sudo tail -n 500 /var/log/syslog
283277
- >
284278
echo "#### Build failed; Disk usage after running script:";
285279
df -h;

src/ci/docker/run.sh

-4
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,6 @@ fi
119119
# goes ahead and sets it for all builders.
120120
args="$args --privileged"
121121

122-
if [ "$CI" != "" ]; then
123-
args="$args --dns 8.8.8.8 --dns 8.8.4.4 --dns 1.1.1.1 --dns 1.0.0.1"
124-
fi
125-
126122
exec docker \
127123
run \
128124
--volume "$root_dir:/checkout:ro" \

0 commit comments

Comments
 (0)