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

Add Docker image to run AArch64 Linux tests #73650

Merged
merged 5 commits into from
Jul 4, 2020
Merged

Add Docker image to run AArch64 Linux tests #73650

merged 5 commits into from
Jul 4, 2020

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented Jun 23, 2020 •
edited
Loading

This PR adds a Docker image to run the AArch64 Linux test suite on a native AArch64 host platform, which will be used in the future to run the test suite in our CI. The image will also be useful for ARM folks to ensure internally that the bugfixes they submit work.

This will be the first Docker image designed to run on a non-x86_64 host platform, and to prevent surprising behavior this PR moves all images requiring a x86_64 host in the src/ci/docker/host-x86_64 directory. Paths and scripts are changed accordingly, and a helpful error message is added when someone tries to run an image on the wrong architecture:

Invalid image: aarch64-gnu
Note: the image exists for the aarch64 host architecture
Note: the current host architecture is x86_64

The old emulated and disabled aarch64-gnu builder is also removed in this PR.

This PR is best reviewed commit-by-commit.
r? @Mark-Simulacrum

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 23, 2020
@rust-highfive

This comment has been minimized.

Sign in to view
Mark-Simulacrum
Mark-Simulacrum approved these changes Jun 26, 2020
View reviewed changes
src/ci/docker/scripts/sccache.sh

curl -fo /usr/local/bin/sccache "${url}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm thinking we might want to make sure that the sccache for aarch64 and x86_64 is always of the same version -- just to avoid potential collisions that aren't properly handled or whatever.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, what do you have in mind to check that?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I just meant that we'd always have the same date for both -- not automatically checking it, but manually enforcing by updating both at the same time.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're not running this builder on CI yet, so there is not going to be duplication at least for a little while. Would you be ok if I follow up on sccache in a separate PR? Building it on musl is kinda of a pain, so I'm working on a script.

@Mark-Simulacrum
Copy link
Member

Modulo the one nit, seems good to me. r=me when ready and nit is resolved

@pietroalbini
Copy link
Member Author

@bors r=Mark-Simulacrum p=1 rollup=never

@bors
Copy link
Contributor

bors commented Jun 26, 2020

📌 Commit 0c3661e58d81c7bc9170b09f2550131ce9a40cf8 has been approved by Mark-Simulacrum

@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 Jun 26, 2020
@pietroalbini
Copy link
Member Author

This will cause a rebuild of most of the CI images.

@bors
Copy link
Contributor

bors commented Jun 27, 2020

⌛ Testing commit 0c3661e58d81c7bc9170b09f2550131ce9a40cf8 with merge 48c74ee23c8fc4714b9b7330c8272f380c130d1c...

@bors
Copy link
Contributor

bors commented Jun 27, 2020

💔 Test failed - checks-azure

@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 Jun 27, 2020
@bors
Copy link
Contributor

bors commented Jun 27, 2020

☔ The latest upstream changes (presumably #73779) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum Mark-Simulacrum 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 Jun 28, 2020
@pietroalbini
Copy link
Member Author

Fixed the COPYs I forgot to change.

@bors r=Mark-Simulacrum p=1

@bors
Copy link
Contributor

bors commented Jun 29, 2020

📌 Commit f7ed57fa3931894390f217a0077fb43d31454667 has been approved by Mark-Simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 29, 2020
@bors
Copy link
Contributor

bors commented Jun 29, 2020

⌛ Testing commit f7ed57fa3931894390f217a0077fb43d31454667 with merge 3fa5b9a7632cff23d9aa5d22dce447ef9d34ecf3...

@bors
Copy link
Contributor

bors commented Jun 29, 2020

💔 Test failed - checks-azure

@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 Jun 29, 2020
@bors
Copy link
Contributor

bors commented Jul 3, 2020

💥 Test timed out

@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 Jul 3, 2020
@pietroalbini
Copy link
Member Author

@bors retry p=1000

@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 Jul 3, 2020
@bors
Copy link
Contributor

bors commented Jul 3, 2020

⌛ Testing commit 775eeb3 with merge 3d9c4481de234870b4aedee630113c7df21d8566...

@pietroalbini
Copy link
Member Author

The timeout was expected, as this PR had to rebuild the Linux Docker images which take hours to build. Now this should land without any problem.

@bors bors mentioned this pull request Jul 3, 2020
Merged
@bors
Copy link
Contributor

bors commented Jul 3, 2020

💔 Test failed - checks-actions

@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 Jul 3, 2020
@Manishearth
Copy link
Member

@bors retry

network

@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 Jul 3, 2020
@bors
Copy link
Contributor

bors commented Jul 3, 2020

⌛ Testing commit 775eeb3 with merge 9a13ef2...

@bors
Copy link
Contributor

bors commented Jul 4, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 9a13ef2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 4, 2020
@bors bors merged commit 9a13ef2 into rust-lang:master Jul 4, 2020
This was referenced Jul 4, 2020
Closed
Merged
Merged
Closed
Merged
Merged
@pietroalbini pietroalbini deleted the ci-aarch64-gnu branch July 4, 2020 11:44
@JohnTitor JohnTitor mentioned this pull request Jul 4, 2020
Merged
@pietroalbini pietroalbini mentioned this pull request Jul 8, 2020
Merged
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum approved these changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.46
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@pietroalbini @rust-highfive @Mark-Simulacrum @bors @Manishearth @cuviper