Skip to content

Adding multi-arch support for the configure.sh script#6751

Merged
estesp merged 1 commit intocontainerd:mainfrom
nobellium1997:arm-support-gce-configure
Apr 1, 2022
Merged

Adding multi-arch support for the configure.sh script#6751
estesp merged 1 commit intocontainerd:mainfrom
nobellium1997:arm-support-gce-configure

Conversation

@nobellium1997
Copy link
Copy Markdown
Contributor

This script is used by various tests to install and configure
containerd. However, right now it's hardcoded to only support x86
and not other architectures like arm. This change will now check the
architecture of the machine the script is running on and will pull
the correct artifacts accordingly from the correct artifact store
(GCS vs Github).

Signed-off-by: Nobel Barakat [email protected]

@k8s-ci-robot
Copy link
Copy Markdown

Hi @nobellium1997. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@nobellium1997 nobellium1997 force-pushed the arm-support-gce-configure branch 4 times, most recently from a5a0166 to f95260f Compare March 31, 2022 23:04
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Mar 31, 2022

Build succeeded.

Comment thread contrib/gce/configure.sh Outdated
# deciding it in cloud init. This may cause issue to reboot test.
version=$(curl -f --ipv4 --retry 6 --retry-delay 3 --silent --show-error \
https://storage.googleapis.com/${deploy_path}/latest)
if [ $(arch) == "aarch64" ]; then
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is it better to use uname -m? arch isn't on all linux systems

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ah good point. Fixed.

@nobellium1997 nobellium1997 force-pushed the arm-support-gce-configure branch from f95260f to 94fd4b0 Compare April 1, 2022 19:09
This script is used by various tests to install and configure
containerd. However, right now it's hardcoded to only support x86
and not other architectures like arm. This change will now check the
architecture of the machine the script is running on and will pull
the correct artifacts accordingly from the correct artifact store
(GCS vs Github).

Signed-off-by: Nobel Barakat <[email protected]>
@nobellium1997 nobellium1997 force-pushed the arm-support-gce-configure branch from 94fd4b0 to 4bdac2b Compare April 1, 2022 19:10
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 1, 2022

Build succeeded.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit 00d951e into containerd:main Apr 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants