-
Notifications
You must be signed in to change notification settings - Fork 319
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
base: main
Are you sure you want to change the base?
Arm runner #1262
Conversation
There was a problem hiding this 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
.github/workflows/ci.yaml
Outdated
- name: Set up QEMU | ||
uses: docker/setup-qemu-action@v3 | ||
with: | ||
image: tonistiigi/binfmt:master |
There was a problem hiding this comment.
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.
VERSION: ${COMMIT_SHORT_SHA}-arm | ||
run: | | ||
echo "${VERSION}" | ||
make build-${{ matrix.dist }} |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
.github/workflows/ci.yaml
Outdated
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 |
There was a problem hiding this comment.
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
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 }} |
.github/workflows/ci.yaml
Outdated
${MANIFEST_VAL} \ | ||
${IMAGE_ID_AMD_VAL} \ | ||
${IMAGE_ID_ARM_VAL} | ||
docker manifest push ${MANIFEST} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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) |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
validator/Makefile
Outdated
ifeq ($(BUILD_MULTI_ARCH_IMAGES),true) | ||
include $(CURDIR)/multi-arch.mk | ||
else | ||
include $(CURDIR)/multi-arch.mk | ||
include $(CURDIR)/native-only.mk |
There was a problem hiding this comment.
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. |
There was a problem hiding this comment.
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?
validator/arm-only.mk
Outdated
@@ -0,0 +1,19 @@ | |||
# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
.github/workflows/ci.yaml
Outdated
@@ -19,6 +19,7 @@ on: | |||
branches: | |||
- "pull-request/[0-9]+" | |||
- main | |||
- ARM_Runner |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
7f02169
to
c8a5e54
Compare
/ok to test |
........... PR changes 2 Signed-off-by: Arjun <[email protected]>
c8a5e54
to
ae0537c
Compare
.github/workflows/ci.yaml
Outdated
@@ -19,6 +19,7 @@ on: | |||
branches: | |||
- "pull-request/[0-9]+" | |||
- main | |||
- ARM_Runner |
There was a problem hiding this comment.
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.
.github/workflows/ci.yaml
Outdated
@@ -133,6 +134,7 @@ jobs: | |||
echo "LABEL_IMAGE_SOURCE=https://github.com/${REPO_FULL_NAME}" >> $GITHUB_ENV | |||
|
|||
GENERATE_ARTIFACTS="false" | |||
#NOT_USING_ARM="false" |
There was a problem hiding this comment.
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
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: unneeded newlines.
.github/workflows/ci.yaml
Outdated
SUBCOMPONENT: validator | ||
run: | | ||
echo "${VERSION}" | ||
make build-${{ matrix.dist }} | ||
|
||
|
||
### MULTI-ARCH-IMAGES test ### |
There was a problem hiding this comment.
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.
.github/workflows/ci.yaml
Outdated
- name: Set up Docker Buildx | ||
uses: docker/setup-buildx-action@v3 |
There was a problem hiding this comment.
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.
.github/workflows/ci.yaml
Outdated
LOWERCASE_REPO_OWNER: ${{ env.LOWERCASE_REPO_OWNER }} | ||
COMMIT_SHORT_SHA: ${{ env.COMMIT_SHORT_SHA }} |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
b2eacc7
to
9de76aa
Compare
Signed-off-by: Arjun <[email protected]>
9de76aa
to
1b9777b
Compare
No description provided.