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

Source Bottlerocket artifacts from new upload location #6703

Merged
merged 1 commit into from
Sep 19, 2023

Conversation

abhay-krishna
Copy link
Member

@abhay-krishna abhay-krishna commented Sep 19, 2023

We upload Bottlerocket OS images to an OS version folder and we need to source it from the same folder during dev and staging releases.

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/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 19, 2023
@abhay-krishna
Copy link
Member Author

/approve
/cherrypick release-0.17

@eks-distro-pr-bot
Copy link
Contributor

@abhay-krishna: once the present PR merges, I will cherry-pick it on top of release-0.17 in a new PR and assign it to you.

In response to this:

/approve
/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-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

@codecov
Copy link

codecov bot commented Sep 19, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (8382d1a) 75.59% compared to head (4da4bb8) 75.60%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6703   +/-   ##
=======================================
  Coverage   75.59%   75.60%           
=======================================
  Files         474      474           
  Lines       38250    38251    +1     
=======================================
+ Hits        28916    28920    +4     
+ Misses       7726     7724    -2     
+ Partials     1608     1607    -1     
Files Changed Coverage Δ
pkg/providers/vsphere/vsphere.go 68.82% <100.00%> (+0.39%) ⬆️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@abhay-krishna
Copy link
Member Author

/override eks-anywhere-cli-attribution-presubmit eks-anywhere-e2e-presubmit eks-anywhere-presubmit

@eks-distro-bot
Copy link
Collaborator

@abhay-krishna: Overrode contexts on behalf of abhay-krishna: eks-anywhere-cli-attribution-presubmit, eks-anywhere-e2e-presubmit, eks-anywhere-presubmit

In response to this:

/override eks-anywhere-cli-attribution-presubmit eks-anywhere-e2e-presubmit eks-anywhere-presubmit

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
Copy link
Member Author

/override eks-anywhere-presubmit

@eks-distro-bot
Copy link
Collaborator

@abhay-krishna: Overrode contexts on behalf of abhay-krishna: eks-anywhere-presubmit

In response to this:

/override eks-anywhere-presubmit

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.

@tatlat
Copy link
Member

tatlat commented Sep 19, 2023

/lgtm

@eks-distro-bot eks-distro-bot merged commit 7419a27 into aws:main Sep 19, 2023
5 checks passed
@eks-distro-pr-bot
Copy link
Contributor

@abhay-krishna: #6703 failed to apply on top of branch "release-0.17":

Applying: Source Bottlerocket artifacts from new upload location
Using index info to reconstruct a base tree...
M	release/pkg/assets/config/bundle_release.go
M	release/pkg/test/testdata/main-bundle-release.yaml
Falling back to patching base and 3-way merge...
Auto-merging release/pkg/test/testdata/main-bundle-release.yaml
CONFLICT (content): Merge conflict in release/pkg/test/testdata/main-bundle-release.yaml
Auto-merging release/pkg/assets/config/bundle_release.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Source Bottlerocket artifacts from new upload location
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:

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

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