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

Arm runner #1262

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Arm runner #1262

wants to merge 2 commits into from

Conversation

JunAr7112
Copy link

No description provided.

Copy link

copy-pr-bot bot commented Feb 11, 2025

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

Copy link
Contributor

@cdesiniotis cdesiniotis left a comment

Choose a reason for hiding this comment

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

@JunAr7112 thanks for raising this PR. Can you please squash your commits into one and sign off your commit? Our DCO check is failing https://github.com/NVIDIA/gpu-operator/pull/1262/checks

Comment on lines 148 to 151
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
image: tonistiigi/binfmt:master
Copy link
Contributor

Choose a reason for hiding this comment

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

We no longer need QEMU since we are not cross-compiling anymore.

.github/workflows/ci.yaml Outdated Show resolved Hide resolved
VERSION: ${COMMIT_SHORT_SHA}-arm
run: |
echo "${VERSION}"
make build-${{ matrix.dist }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Question -- do we need to invoke the push target after this to ensure the tag gets pushed to the ghcr.io registry?

Copy link
Author

Choose a reason for hiding this comment

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

I think the push target gets invoked in the Makefile via its inclusion in native-only.mk.

IMAGE_ID_AMD: ghcr.io/${{ env.LOWERCASE_REPO_OWNER}}/gpu-operator:${{ env.COMMIT_SHORT_SHA }}-amd
IMAGE_ID_ARM_VAL: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator/gpu-operator-validator:${{ env.COMMIT_SHORT_SHA }}-arm
IMAGE_ID_AMD_VAL: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator/gpu-operator-validator:${{ env.COMMIT_SHORT_SHA }}-amd
MANIFEST: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator:${{ env.COMMIT_SHORT_SHA }}-multiarch
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's remove the -multiarch suffix

Suggested change
MANIFEST: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator:${{ env.COMMIT_SHORT_SHA }}-multiarch
MANIFEST: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator:${{ env.COMMIT_SHORT_SHA }}

${MANIFEST_VAL} \
${IMAGE_ID_AMD_VAL} \
${IMAGE_ID_ARM_VAL}
docker manifest push ${MANIFEST}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
docker manifest push ${MANIFEST}
docker manifest push ${MANIFEST_VAL}

DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64

#DOCKER_BUILD_PLATFORM_OPTIONS = --platform ?= linux/amd64
DOCKER_BUILD_OPTIONS = --output=type=image,push=$(PUSH_ON_BUILD) --provenance=$(ATTACH_ATTESTATIONS) --sbom=$(ATTACH_ATTESTATIONS)
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the rationale behind this change?

Copy link
Author

Choose a reason for hiding this comment

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

So I commented out the DOCKER_BUILD_PLATFORM_OPTIONS because we were already specifying it in the workflow in ci.yaml. I added the DOCKER_BUILD_OPTIONS to store the image so we can build the Manifest in the next job.

Comment on lines 50 to 53
ifeq ($(BUILD_MULTI_ARCH_IMAGES),true)
include $(CURDIR)/multi-arch.mk
else
include $(CURDIR)/multi-arch.mk
include $(CURDIR)/native-only.mk
Copy link
Contributor

Choose a reason for hiding this comment

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

What was the rationale behind this change?

arm-only.mk Outdated
@@ -0,0 +1,20 @@
# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't see this file being used as at all, and it shouldn't be needed. Can we remove it?

@@ -0,0 +1,19 @@
# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't see this file being used as at all, and it shouldn't be needed. Can we remove it?

Copy link
Author

Choose a reason for hiding this comment

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

Yes I will remove it.

@@ -19,6 +19,7 @@ on:
branches:
- "pull-request/[0-9]+"
- main
- ARM_Runner
Copy link
Contributor

Choose a reason for hiding this comment

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

This should not be needed. Our GitHub actions run on PRs, so the changes you are making we can test via this PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

@JunAr7112 let's remove this.

@cdesiniotis
Copy link
Contributor

/ok to test

...........

PR changes 2

Signed-off-by: Arjun <[email protected]>
@@ -19,6 +19,7 @@ on:
branches:
- "pull-request/[0-9]+"
- main
- ARM_Runner
Copy link
Contributor

Choose a reason for hiding this comment

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

@JunAr7112 let's remove this.

@@ -133,6 +134,7 @@ jobs:
echo "LABEL_IMAGE_SOURCE=https://github.com/${REPO_FULL_NAME}" >> $GITHUB_ENV

GENERATE_ARTIFACTS="false"
#NOT_USING_ARM="false"
Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove this.

Makefile Outdated
Comment on lines 259 to 260


Copy link
Contributor

Choose a reason for hiding this comment

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

nit: unneeded newlines.

SUBCOMPONENT: validator
run: |
echo "${VERSION}"
make build-${{ matrix.dist }}


### MULTI-ARCH-IMAGES test ###
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: update the comment or remove it.

Comment on lines 316 to 317
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Copy link
Contributor

Choose a reason for hiding this comment

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

We don't need docker buildx for this job.

Comment on lines 326 to 327
LOWERCASE_REPO_OWNER: ${{ env.LOWERCASE_REPO_OWNER }}
COMMIT_SHORT_SHA: ${{ env.COMMIT_SHORT_SHA }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Are these lines needed? It looks like you are already adding this variables to the environment in a prior step.

Copy link
Author

Choose a reason for hiding this comment

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

I will remove these lines

Signed-off-by: Arjun <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants