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

Update base image in tag file(s) #2268

Merged
merged 1 commit into from
Jun 30, 2023

Conversation

eks-distro-pr-bot
Copy link
Contributor

This PR updates the base image tag in tag file(s) with the tag of the newly-built EKS Distro base image and/or its minimal variants.

/hold

Click here to view job logs.

By submitting this pull request,I confirm that you can use, modify, copy,and redistribute this contribution,under the terms of your choice.

@eks-distro-bot
Copy link
Collaborator

Hi @eks-distro-pr-bot. Thanks for your PR.

I'm waiting for a aws 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.

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/test-infra repository.

@eks-distro-bot eks-distro-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 27, 2023
@eks-distro-bot eks-distro-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 27, 2023
@jonathanmeier5
Copy link
Member

/lgtm
/approve

@jonathanmeier5
Copy link
Member

/approve
/lgtm

Copy link
Contributor

@TerryHowe TerryHowe left a comment

Choose a reason for hiding this comment

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

/unhold
/lgtm
/approve
/ok-to-test

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jonathanmeier5, TerryHowe

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [TerryHowe,jonathanmeier5]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jonathanmeier5
Copy link
Member

/cherry-pick release-0.16

@eks-distro-pr-bot
Copy link
Contributor Author

@jonathanmeier5: #2268 failed to apply on top of branch "release-0.16":

Applying: Update base image in tag file(s)
Using index info to reconstruct a base tree...
A	EKS_DISTRO_MINIMAL_BASE_PYTHON_3.9_AL2023_TAG_FILE
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): EKS_DISTRO_MINIMAL_BASE_PYTHON_3.9_AL2023_TAG_FILE deleted in HEAD and modified in Update base image in tag file(s). Version Update base image in tag file(s) of EKS_DISTRO_MINIMAL_BASE_PYTHON_3.9_AL2023_TAG_FILE left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update base image in tag file(s)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.16

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/test-infra repository.

jonathanmeier5 pushed a commit to jonathanmeier5/eks-anywhere-build-tooling that referenced this pull request Jun 30, 2023
jonathanmeier5 pushed a commit to jonathanmeier5/eks-anywhere-build-tooling that referenced this pull request Jun 30, 2023
eks-distro-bot pushed a commit that referenced this pull request Jun 30, 2023
Co-authored-by: EKS Distro PR Bot <75336432+eks-distro-pr-bot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm ok-to-test size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants