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.

Sign up for GitHub

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

Jump to bottom

Allow forcing compression with v2s2 format #24673

Merged
merged 2 commits into from
Dec 2, 2024
Merged

Allow forcing compression with v2s2 format #24673

merged 2 commits into from
Dec 2, 2024

Conversation

Jamstah
Copy link
Contributor

@Jamstah Jamstah commented Nov 25, 2024

This highlights a bug in common where the compression format is reset if the format is v2s2, even if its a valid compression format.

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none labels Nov 25, 2024
@Jamstah Jamstah force-pushed the allow-forced-gzip-on-v2s2 branch 2 times, most recently from ccf7160 to 71c9623 Compare November 25, 2024 17:32
@Jamstah Jamstah mentioned this pull request Nov 25, 2024
Closed
@Jamstah Jamstah force-pushed the allow-forced-gzip-on-v2s2 branch from 71c9623 to d16d868 Compare November 25, 2024 22:33
@Jamstah Jamstah mentioned this pull request Nov 26, 2024
Merged
Luap99
Luap99 reviewed Nov 26, 2024
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

cc @mtrmac

test/e2e/push_test.go Outdated Show resolved Hide resolved
test/e2e/push_test.go Show resolved Hide resolved
@Jamstah Jamstah force-pushed the allow-forced-gzip-on-v2s2 branch 2 times, most recently from 6871b47 to 5563a32 Compare November 26, 2024 13:25
@packit-as-a-service Packit-as-a-Service
Copy link

Cockpit tests failed for commit 6871b47. @martinpitt, @jelly, @mvollmer please check.

@packit-as-a-service Packit-as-a-Service
Copy link

Cockpit tests failed for commit 5563a32. @martinpitt, @jelly, @mvollmer please check.

@martinpitt martinpitt mentioned this pull request Nov 26, 2024
Merged
@martinpitt
Copy link
Contributor

Wrt. failed cockpit rawhide test: I reported the criu/kernel regression to https://bugzilla.redhat.com/show_bug.cgi?id=2328985 and silenced it in our tests in cockpit-project/bots#7146 . From now on, this failure will be ignored, i.e. tests should go back to green. Please either retry or re-push.

mtrmac
mtrmac reviewed Nov 26, 2024
View reviewed changes
Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

Thanks! ACK to the goal and overall approach.

test/e2e/push_test.go Show resolved Hide resolved
test/e2e/push_test.go Show resolved Hide resolved
@mtrmac
Copy link
Collaborator

mtrmac commented Nov 26, 2024

For the record, this PR exists to test containers/common#2255 .

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 27, 2024
@Jamstah Jamstah force-pushed the allow-forced-gzip-on-v2s2 branch from 5563a32 to 636b09e Compare November 29, 2024 12:39
@Jamstah
Add a test for forcing compression and v2s2 format
48ae52c 
This highlights a bug in common where the compression format is reset if the format is v2s2, even if its a valid compression format.

Signed-off-by: James Hewitt <[email protected]>
@packit-as-a-service Packit-as-a-Service
Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

@Jamstah Jamstah force-pushed the allow-forced-gzip-on-v2s2 branch from 636b09e to d2ae359 Compare November 29, 2024 13:35
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 29, 2024
@Jamstah Jamstah force-pushed the allow-forced-gzip-on-v2s2 branch 2 times, most recently from 46066cc to 6f0a45d Compare November 29, 2024 17:57
@Jamstah Jamstah changed the title Add a test for forcing compression and v2s2 format Allow forcing compression with v2s2 format Dec 2, 2024
@Jamstah
Switch to fixed common
4382512 
Signed-off-by: James Hewitt <[email protected]>
@Jamstah Jamstah force-pushed the allow-forced-gzip-on-v2s2 branch from 6f0a45d to 4382512 Compare December 2, 2024 12:10
@Jamstah Jamstah marked this pull request as ready for review December 2, 2024 12:11
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 2, 2024
@mtrmac
Copy link
Collaborator

mtrmac commented Dec 2, 2024

/approve

LGTM

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 2, 2024
@mtrmac mtrmac linked an issue Dec 2, 2024 that may be closed by this pull request
Cannot use --force-compression with --format v2s2 #23942
Closed
Luap99
Luap99 approved these changes Dec 2, 2024
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 2, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Jamstah, Luap99, mtrmac

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

@openshift-merge-bot openshift-merge-bot bot merged commit 02a9d9c into containers:main Dec 2, 2024
87 of 88 checks passed
@mtrmac
Copy link
Collaborator

mtrmac commented Dec 2, 2024

Thanks @Jamstah !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mtrmac mtrmac mtrmac left review comments

@Luap99 Luap99 Luap99 approved these changes

Assignees

@Luap99 Luap99

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. release-note-none
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cannot use --force-compression with --format v2s2
5 participants
@Jamstah @martinpitt @mtrmac @Luap99 @openshift-merge-robot