Skip to content

Update install-imgcrypt to allow change install repo#11019

Merged
samuelkarp merged 1 commit intocontainerd:mainfrom
jingxu97:patch-3
Nov 18, 2024
Merged

Update install-imgcrypt to allow change install repo#11019
samuelkarp merged 1 commit intocontainerd:mainfrom
jingxu97:patch-3

Conversation

@jingxu97
Copy link
Copy Markdown
Contributor

@jingxu97 jingxu97 commented Nov 18, 2024

Add repo env similar to other install script

@jingxu97
Update install-imgcrypt to allow change install repo
f8819df 
Add repo env similar to other install script

Signed-off-by: Jing Xu <[email protected]>
@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Nov 18, 2024

Hi @jingxu97. 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-sigs/prow repository.

@jingxu97
Copy link
Copy Markdown
Contributor Author

jingxu97 commented Nov 18, 2024

/assign @Random-Liu

@akhilerm
Copy link
Copy Markdown
Member

akhilerm commented Nov 18, 2024

/ok-to-test

@ktock ktock mentioned this pull request Nov 18, 2024
Closed
@dmcgowan dmcgowan added this pull request to the merge queue Nov 18, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Nov 18, 2024
@samuelkarp samuelkarp added this pull request to the merge queue Nov 18, 2024
Merged via the queue into containerd:main with commit 50bdcb0 Nov 18, 2024
@samuelkarp samuelkarp mentioned this pull request Feb 7, 2025
Closed
@samuelkarp samuelkarp added cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Feb 7, 2025
@samuelkarp
Copy link
Copy Markdown
Member

samuelkarp commented Feb 7, 2025

/cherrypick release/2.0

@samuelkarp
Copy link
Copy Markdown
Member

samuelkarp commented Feb 7, 2025

/cherrypick release/1.7

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Feb 7, 2025

@samuelkarp: new pull request created: #11357

Details

In response to this:

/cherrypick release/2.0

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-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Feb 7, 2025
Merged
@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Feb 7, 2025

@samuelkarp: #11019 failed to apply on top of branch "release/1.7":

Applying: Update install-imgcrypt to allow change install repo
Using index info to reconstruct a base tree...
M	script/setup/install-imgcrypt
Falling back to patching base and 3-way merge...
Auto-merging script/setup/install-imgcrypt
CONFLICT (content): Merge conflict in script/setup/install-imgcrypt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Update install-imgcrypt to allow change install repo
Details

In response to this:

/cherrypick release/1.7

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-sigs/prow repository.

@samuelkarp
Copy link
Copy Markdown
Member

samuelkarp commented Feb 7, 2025

Manual cherry-pick in #11358 due to a conflict caused by #9619 (which I did not backport as I'm not looking to change imgcrypt version).

lalitc375 pushed a commit to lalitc375/containerd that referenced this pull request Feb 20, 2025
@samuelkarp @lalitc375
Merge pull request containerd#11019 from jingxu97/patch-3
01039b3 
Update install-imgcrypt to allow change install repo

(cherry picked from commit 50bdcb0)
Signed-off-by: Lalit Chauhan <[email protected]>
@samuelkarp samuelkarp removed the cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch label Feb 21, 2025
@samuelkarp samuelkarp added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch cherry-pick/1.6.x and removed cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Feb 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@samuelkarp samuelkarp samuelkarp approved these changes

@akhilerm akhilerm akhilerm approved these changes

@ktock ktock ktock approved these changes

Assignees

@Random-Liu Random-Liu

Labels

cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch ok-to-test size/XS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@jingxu97 @k8s-ci-robot @akhilerm @samuelkarp @k8s-infra-cherrypick-robot @dmcgowan @ktock @Random-Liu