Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Aug 16, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42efd27
Revert "Auto merge of #53134 - alexcrichton:tweak-travis, r=Mark-Simu…
kennytm Aug 9, 2018
53837db
Revert "Auto merge of #53035 - alexcrichton:debug-travis, r=kennytm"
kennytm Aug 9, 2018
b75f1ba
Revert "Use public DNS server instead of 169.254.169.254 on CI."
kennytm Aug 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -278,8 +274,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;
Expand Down
4 changes: 0 additions & 4 deletions src/ci/docker/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down