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

Support dev release image builds from prod image-builder #2368

Merged
merged 1 commit into from
Aug 8, 2023

Conversation

abhay-krishna
Copy link
Member

This feature was added in #2312 but inadvertently removed in the refactor done in #2361.

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 eks-distro-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 8, 2023
@eks-distro-bot eks-distro-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 8, 2023
@abhay-krishna
Copy link
Member Author

/lgtm
/approve

@eks-distro-bot
Copy link
Collaborator

@abhay-krishna: you cannot LGTM your own PR.

In response to this:

/lgtm
/approve

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
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhay-krishna

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:

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

@eks-distro-bot eks-distro-bot merged commit 703eafa into aws:main Aug 8, 2023
@abhay-krishna
Copy link
Member Author

/cherrypick release-0.16

@abhay-krishna
Copy link
Member Author

/cherrypick release-0.17

@eks-distro-pr-bot
Copy link
Contributor

@abhay-krishna: #2368 failed to apply on top of branch "release-0.16":

Applying: Support dev release image builds from prod image-builder
Using index info to reconstruct a base tree...
M	projects/aws/image-builder/CHECKSUMS
M	projects/aws/image-builder/builder/builder.go
M	projects/aws/image-builder/builder/constants.go
M	projects/aws/image-builder/builder/utils.go
M	projects/kubernetes-sigs/image-builder/build/setup_packer_configs.sh
Falling back to patching base and 3-way merge...
Auto-merging projects/kubernetes-sigs/image-builder/build/setup_packer_configs.sh
Auto-merging projects/aws/image-builder/builder/utils.go
CONFLICT (content): Merge conflict in projects/aws/image-builder/builder/utils.go
Auto-merging projects/aws/image-builder/builder/constants.go
CONFLICT (content): Merge conflict in projects/aws/image-builder/builder/constants.go
Auto-merging projects/aws/image-builder/builder/builder.go
Auto-merging projects/aws/image-builder/CHECKSUMS
CONFLICT (content): Merge conflict in projects/aws/image-builder/CHECKSUMS
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Support dev release image builds from prod image-builder
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:

/cherrypick 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.

@eks-distro-pr-bot
Copy link
Contributor

@abhay-krishna: new pull request created: #2369

In response to this:

/cherrypick release-0.17

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-pr-bot
Copy link
Contributor

@abhay-krishna: #2368 failed to apply on top of branch "release-0.16":

Applying: Support dev release image builds from prod image-builder
Using index info to reconstruct a base tree...
M	projects/aws/image-builder/CHECKSUMS
M	projects/aws/image-builder/builder/builder.go
M	projects/aws/image-builder/builder/constants.go
M	projects/aws/image-builder/builder/utils.go
M	projects/kubernetes-sigs/image-builder/build/setup_packer_configs.sh
Falling back to patching base and 3-way merge...
Auto-merging projects/kubernetes-sigs/image-builder/build/setup_packer_configs.sh
Auto-merging projects/aws/image-builder/builder/utils.go
CONFLICT (content): Merge conflict in projects/aws/image-builder/builder/utils.go
Auto-merging projects/aws/image-builder/builder/constants.go
CONFLICT (content): Merge conflict in projects/aws/image-builder/builder/constants.go
Auto-merging projects/aws/image-builder/builder/builder.go
Auto-merging projects/aws/image-builder/CHECKSUMS
CONFLICT (content): Merge conflict in projects/aws/image-builder/CHECKSUMS
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Support dev release image builds from prod image-builder
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:

/cherrypick 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.

@abhay-krishna abhay-krishna deleted the image-builder-dev branch September 21, 2023 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants