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

Extract links from kmod images #929

Conversation

qbarrand
Copy link
Contributor

Create links as is when extracting files to the worker Pod filesystem.

Fixes #927

/cc @yevgeny-shnaidman

Copy link

netlify bot commented Dec 18, 2023

Deploy Preview for openshift-kmm ready!

Name Link
🔨 Latest commit e59450f
🔍 Latest deploy log https://app.netlify.com/sites/openshift-kmm/deploys/658081f3e801a300084a8dc4
😎 Deploy Preview https://deploy-preview-929--openshift-kmm.netlify.app/
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link

openshift-ci bot commented Dec 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qbarrand

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

Create links as is when extracting files to the worker Pod filesystem.

Upstream-Commit: c064f5d
@qbarrand qbarrand force-pushed the cp-c064f5d58139db6e8d930a0259aa974075d21e11 branch from c20a240 to e59450f Compare December 18, 2023 17:31
@qbarrand
Copy link
Contributor Author

/cherry-pick release-2.0

@openshift-cherrypick-robot

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

In response to this:

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

@yevgeny-shnaidman
Copy link
Member

/lgtm

@codecov-commenter
Copy link

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (cd3cd04) 76.29% compared to head (e59450f) 77.29%.
Report is 2 commits behind head on main.

Files Patch % Lines
internal/worker/imagepuller.go 85.71% 0 Missing and 1 partial ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #929      +/-   ##
==========================================
+ Coverage   76.29%   77.29%   +1.00%     
==========================================
  Files          60       60              
  Lines        5677     5766      +89     
==========================================
+ Hits         4331     4457     +126     
+ Misses       1123     1096      -27     
+ Partials      223      213      -10     

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

@openshift-merge-bot openshift-merge-bot bot merged commit 1ac1c76 into rh-ecosystem-edge:main Dec 19, 2023
18 checks passed
@openshift-cherrypick-robot

@qbarrand: #929 failed to apply on top of branch "release-2.0":

Applying: Extract links from kmod images
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	internal/worker/imagepuller.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging internal/worker/imagepuller.go
CONFLICT (content): Merge conflict in internal/worker/imagepuller.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Extract links from kmod images
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-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/test-infra repository.

@qbarrand qbarrand deleted the cp-c064f5d58139db6e8d930a0259aa974075d21e11 branch December 19, 2023 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cherry-picking error for c064f5d58139db6e8d930a0259aa974075d21e11
4 participants