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

Staging bundle trigger for patch v0.17.3 #6730

Merged
merged 1 commit into from
Sep 26, 2023

Conversation

mitalipaygude
Copy link
Member

Issue #, if available:

Description of changes:
Staging bundle trigger for patch v0.17.3

Documentation added/planned (if applicable):

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 26, 2023
@abhay-krishna
Copy link
Member

/lgtm
/approve

@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 26, 2023

Codecov Report

All modified lines are covered by tests ✅

❗ No coverage uploaded for pull request base (release-0.17@02a45dd). Click here to learn what that means.

Additional details and impacted files
@@               Coverage Diff               @@
##             release-0.17    #6730   +/-   ##
===============================================
  Coverage                ?   75.51%           
===============================================
  Files                   ?      455           
  Lines                   ?    37917           
  Branches                ?        0           
===============================================
  Hits                    ?    28633           
  Misses                  ?     7674           
  Partials                ?     1610           

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

@eks-distro-bot eks-distro-bot merged commit ec4d7d8 into aws:release-0.17 Sep 26, 2023
@mitalipaygude
Copy link
Member Author

/cherrypick main

@eks-distro-pr-bot
Copy link
Contributor

@mitalipaygude: #6730 failed to apply on top of branch "main":

Applying: Staging bundle trigger for patch v0.17.3
Using index info to reconstruct a base tree...
M	release/triggers/bundle-release/development/BUNDLE_NUMBER
M	release/triggers/bundle-release/development/CLI_MAX_VERSION
M	release/triggers/bundle-release/development/CLI_MIN_VERSION
Falling back to patching base and 3-way merge...
Auto-merging release/triggers/bundle-release/development/CLI_MIN_VERSION
CONFLICT (content): Merge conflict in release/triggers/bundle-release/development/CLI_MIN_VERSION
Auto-merging release/triggers/bundle-release/development/CLI_MAX_VERSION
CONFLICT (content): Merge conflict in release/triggers/bundle-release/development/CLI_MAX_VERSION
Auto-merging release/triggers/bundle-release/development/BUNDLE_NUMBER
CONFLICT (content): Merge conflict in release/triggers/bundle-release/development/BUNDLE_NUMBER
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Staging bundle trigger for patch v0.17.3
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 main

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants