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

Support arm64 for more tests/examples #6

Merged
merged 3 commits into from
Sep 6, 2024
Merged

Support arm64 for more tests/examples #6

merged 3 commits into from
Sep 6, 2024

Conversation

everpeace
Copy link
Contributor

@everpeace everpeace commented Sep 5, 2024 •
edited
Loading

Currently, for arm64, it only tests sshfs in proxy&starter mode.
This PR extends arm64 support for other examples.

parahaps relates to #5

manual e2e test result on darwin/arm64 
❯ uname -ms
Darwin arm64
❯ kind version
kind v0.23.0 go1.21.10 darwin/arm64

❯ make test-e2e
...
./examples/check.sh ./proxy/mountpoint-s3 mfcp-example-proxy-mountpoint-s3 starter /test.txt busybox /data/test.txt
Checking Pod "mfcp-example-proxy-mountpoint-s3"...
pod/mfcp-example-proxy-mountpoint-s3 created
waiting for pod
waiting for pod
waiting for pod
waiting for pod
waiting for pod
waiting for pod
waiting for pod
waiting for pod
waiting for pod
waiting for pod
waiting for pod
waiting for pod
Pod is ready.
FUSE is mounted.
OK.
pod "mfcp-example-proxy-mountpoint-s3" deleted
./examples/check.sh ./proxy/goofys mfcp-example-proxy-goofys starter /test.txt busybox /data/test.txt
Checking Pod "mfcp-example-proxy-goofys"...
pod/mfcp-example-proxy-goofys created
waiting for pod
waiting for pod
waiting for pod
waiting for pod
Pod is ready.
FUSE is mounted.
OK.
pod "mfcp-example-proxy-goofys" deleted
./examples/check.sh ./proxy/s3fs mfcp-example-proxy-s3fs starter /test.txt busybox /data/test.txt
Checking Pod "mfcp-example-proxy-s3fs"...
pod/mfcp-example-proxy-s3fs created
waiting for pod
waiting for pod
waiting for pod
waiting for pod
Pod is ready.
FUSE is mounted.
OK.
pod "mfcp-example-proxy-s3fs" deleted
./examples/check.sh ./proxy/ros3fs mfcp-example-proxy-ros3fs starter /test.txt busybox /data/test.txt
Checking Pod "mfcp-example-proxy-ros3fs"...
pod/mfcp-example-proxy-ros3fs created
waiting for pod
waiting for pod
waiting for pod
waiting for pod
Pod is ready.
waiting for mount
FUSE is mounted.
OK.
pod "mfcp-example-proxy-ros3fs" deleted
./examples/check.sh ./proxy/sshfs mfcp-example-proxy-sshfs starter /root/sshfs-example/test.txt busybox /data/test.txt
Checking Pod "mfcp-example-proxy-sshfs"...
pod/mfcp-example-proxy-sshfs created
waiting for pod
waiting for pod
Pod is ready.
FUSE is mounted.
OK.
pod "mfcp-example-proxy-sshfs" deleted
./examples/check.sh ./starter/ros3fs mfcp-example-starter-ros3fs starter /test.txt busybox /data/test.txt
Checking Pod "mfcp-example-starter-ros3fs"...
pod/mfcp-example-starter-ros3fs created
waiting for pod
waiting for pod
waiting for pod
waiting for pod
waiting for pod
Pod is ready.
FUSE is mounted.
OK.
pod "mfcp-example-starter-ros3fs" deleted
./examples/check.sh ./starter/sshfs mfcp-example-starter-sshfs starter /root/sshfs-example/test.txt busybox /data/test.txt
Checking Pod "mfcp-example-starter-sshfs"...
pod/mfcp-example-starter-sshfs created
waiting for pod
waiting for pod
Pod is ready.
FUSE is mounted.
OK.
pod "mfcp-example-starter-sshfs" deleted

@everpeace everpeace mentioned this pull request Sep 5, 2024
Merged
naoki9911
naoki9911 requested changes Sep 6, 2024
View reviewed changes
examples/proxy/mountpoint-s3/Dockerfile Outdated
@@ -25,7 +26,7 @@ set -eux
EOF
RUN chmod +x /configure_minio.sh

RUN wget https://s3.amazonaws.com/mountpoint-s3-release/1.0.1/x86_64/mount-s3-1.0.1-x86_64.deb -O mount-s3.deb && dpkg -i mount-s3.deb
RUN wget https://s3.amazonaws.com/mountpoint-s3-release/latest/${TARGETARCH}/mount-s3.deb -O mount-s3.deb && dpkg -i mount-s3.deb
Copy link
Collaborator

Choose a reason for hiding this comment

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

mountpoint-s3 uses 'x86_64' for amd64 environments.

+ RUN if [ "$TARGETARCH" = "amd64" ]; then TARGETARCH=x86_64; fi && wget https://s3.amazonaws.com/mountpoint-s3-release/latest/${TARGETARCH}/mount-s3.deb -O mount-s3.deb && dpkg -i mount-s3.deb

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, too. fixed in eb3fed6

Makefile Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you remove this line?

meta-fuse-csi-plugin/Makefile

Line 100 in 942093a

--platform linux/${ARCH} .

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, fixed in 4dc8859

everpeace
everpeace commented Sep 6, 2024
View reviewed changes
Copy link
Contributor Author

@everpeace everpeace left a comment

Choose a reason for hiding this comment

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

addressed your comments. PTAL 🙇

Makefile Outdated
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, fixed in 4dc8859

examples/proxy/mountpoint-s3/Dockerfile Outdated
@@ -25,7 +26,7 @@ set -eux
EOF
RUN chmod +x /configure_minio.sh

RUN wget https://s3.amazonaws.com/mountpoint-s3-release/1.0.1/x86_64/mount-s3-1.0.1-x86_64.deb -O mount-s3.deb && dpkg -i mount-s3.deb
RUN wget https://s3.amazonaws.com/mountpoint-s3-release/latest/${TARGETARCH}/mount-s3.deb -O mount-s3.deb && dpkg -i mount-s3.deb
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, too. fixed in eb3fed6

@naoki9911
Copy link
Collaborator

LGTM, Thanks!

@naoki9911 naoki9911 merged commit 66606a7 into pfnet-research:main Sep 6, 2024
1 check passed
@everpeace everpeace deleted the support-arm64 branch September 6, 2024 05:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@naoki9911 naoki9911 naoki9911 requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@everpeace @naoki9911