Skip to content

[release/1.7] Avoid arch info in the sed/replace when building cri-cni-containerd.tar.gz#10976

Merged
mikebrow merged 1 commit into
containerd:release/1.7from
dims:replace-when-building-cri-cni-containerd.tar.gz-really-1.7
Nov 8, 2024
Merged

[release/1.7] Avoid arch info in the sed/replace when building cri-cni-containerd.tar.gz#10976
mikebrow merged 1 commit into
containerd:release/1.7from
dims:replace-when-building-cri-cni-containerd.tar.gz-really-1.7

Conversation

@dims

@dims dims commented Nov 8, 2024

Copy link
Copy Markdown
Member

Cherry pick of #10964 to release/1.7 branch

…ar.gz

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims

dims commented Nov 8, 2024

Copy link
Copy Markdown
Member Author

/assign @estesp @mikebrow @akhilerm

@akhilerm

akhilerm commented Nov 8, 2024

Copy link
Copy Markdown
Member

The 2 failing prow job checks can be ignored as they are not relevant on the release/1.7 branch, but got added here when the same branch was used previously.

@dims

dims commented Nov 8, 2024

Copy link
Copy Markdown
Member Author

/skip

@mikebrow mikebrow left a comment

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.

LGTM

@mikebrow mikebrow merged commit 6fb8bb8 into containerd:release/1.7 Nov 8, 2024
@mikebrow

mikebrow commented Nov 8, 2024

Copy link
Copy Markdown
Member

The one failing check was the wrong prow test.. e2e-node is wrong .. for 1.7 we only run on the e2e 1.7 node test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants