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.

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

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

Merged
merged 3 commits into from
Aug 16, 2018

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Aug 9, 2018

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.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 9, 2018
@rust-highfive

This comment has been minimized.

@kennytm
Copy link
Member Author

kennytm commented Aug 9, 2018

(I just ignored tidy since I expect this PR would be quickly reverted after Travis got what they need.)

@alexcrichton
Copy link
Member

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Aug 10, 2018

📌 Commit 548619ad781f576163e98072cfa5da98e472db21 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 10, 2018
@bors
Copy link
Contributor

bors commented Aug 10, 2018

⌛ Testing commit 548619ad781f576163e98072cfa5da98e472db21 with merge 235f85f17cf60cbc91b8e4fe78c9debd7dd47fc3...

@bors
Copy link
Contributor

bors commented Aug 10, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 10, 2018
@rust-highfive

This comment has been minimized.

@kennytm
Copy link
Member Author

kennytm commented Aug 10, 2018

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Aug 10, 2018

📌 Commit 212fd930424387063fce094386a17f4f6e7d07a2 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 10, 2018
@bors
Copy link
Contributor

bors commented Aug 10, 2018

⌛ Testing commit 212fd930424387063fce094386a17f4f6e7d07a2 with merge 2403f83feea6b804fb79a240f6e682a530c8fc57...

@bors
Copy link
Contributor

bors commented Aug 10, 2018

💔 Test failed - status-travis

@rust-highfive

This comment has been minimized.

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 10, 2018
@kennytm kennytm force-pushed the debug-9696 branch 4 times, most recently from a501452 to 619301c Compare August 10, 2018 07:26
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 13, 2018
@rust-highfive

This comment has been minimized.

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 13, 2018
@kennytm
Copy link
Member Author

kennytm commented Aug 13, 2018

Spurious, but I'll like to hold off merging the final commit for now.

@kennytm kennytm changed the title Replace Travis shutdown debug scripts with DNS debug scripts [WIP] Replace Travis shutdown debug scripts with DNS debug scripts Aug 15, 2018
@kennytm
Copy link
Member Author

kennytm commented Aug 15, 2018

(TODO: Someone issue a @bors try around 0600Z)

@kennytm
Copy link
Member Author

kennytm commented Aug 16, 2018

@bors try

@bors
Copy link
Contributor

bors commented Aug 16, 2018

⌛ Trying commit 536ade5b869522b9c37380c0aaa63d1e87cb58b4 with merge 764a55157c75f2986f74392ab0544d8a2a3bf41d...

@bors
Copy link
Contributor

bors commented Aug 16, 2018

💔 Test failed - status-travis

@rust-highfive

This comment has been minimized.

@kennytm kennytm changed the title [WIP] Replace Travis shutdown debug scripts with DNS debug scripts Remove Travis shutdown debug scripts, and remove CI-specific DNS settings Aug 16, 2018
@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 16, 2018
@kennytm
Copy link
Member Author

kennytm commented Aug 16, 2018

r? @alexcrichton

I've extracted the DNS logs wanted by Travis, and thus the debugging code is removed from this PR now. This PR now only reverts #53134 and #53035. I've also reverted half of #51420 so we'll use the default DNS again.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 16, 2018

📌 Commit b75f1ba has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 16, 2018
@kennytm
Copy link
Member Author

kennytm commented Aug 16, 2018

@bors p=0 rollup

kennytm added a commit to kennytm/rust that referenced this pull request Aug 16, 2018
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.
bors added a commit that referenced this pull request Aug 16, 2018
Rollup of 10 pull requests

Successful merges:

 - #52946 (Documented impl From on line 367 of libserialize/json.rs)
 - #53234 (Remove Travis shutdown debug scripts, and remove CI-specific DNS settings)
 - #53313 (Two small improvements)
 - #53360 (Addressed #51602)
 - #53364 (Warn if the user tries to use GATs)
 - #53373 (Tweak unclosed delimiter parser error)
 - #53377 (std: Use target_pointer_width for BACKTRACE_ELF_SIZE)
 - #53395 (Use #[non_exhaustive] on internal enums)
 - #53399 (Tidy: ignore non-Markdown files when linting for the Unstable Book)
 - #53412 (syntax_ext: remove leftover span_err_if_not_stage0 macro.)
@bors bors merged commit b75f1ba into rust-lang:master Aug 16, 2018
@kennytm kennytm deleted the debug-9696 branch August 17, 2018 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants