[v4.2.0-rhel] Backport: do not pass volume options as bind mounts options to runtime#28458
Merged
lsm5 merged 4 commits intocontainers:v4.2.0-rhelfrom Apr 13, 2026
Merged
Conversation
Starting with runc 1.3.0 it errors when we pass unknown mount options to the runtime, the volume-opt options are specifc to the volume we create and should not be passed to the mount in the oci spec. Fixes: containers#26938 Signed-off-by: Paul Holzinger <pholzing@redhat.com> Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com> (cherry picked from commit 7fda4df) Signed-off-by: Chris Evich <cevich@redhat.com>
Starting with runc 1.3.0 it errors when we pass unknown mount options to the runtime, the copy/nocopy options are specific to podman when we mount the volume and are not valid mount options for the runtime. Fixes: containers#26938 Fixes: https://issues.redhat.com/browse/RHEL-132532, https://issues.redhat.com/browse/RHEL-132531 Signed-off-by: Paul Holzinger <pholzing@redhat.com> Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com> (cherry picked from commit 1e4a59d) Signed-off-by: Chris Evich <cevich@redhat.com>
Member
Author
|
Running system tests...tests finished. No surprises, exactly the same results as #27933 |
6 tasks
Member
Author
|
@TomSweeneyRedHat @lsm5 PTAL when you have a chance. |
Member
|
Running tests on internal ranch. Will update here. |
lsm5
requested changes
Apr 8, 2026
Member
lsm5
left a comment
lsm5
left a comment
There was a problem hiding this comment.
Need to backport PodmanExitCleanly if we need to actually run integration tests.
Member
|
system and other tests are good though. |
Member
Combined test for (exitcode == 0) && (nothing on stderr). Returns more useful diagnostic messages than the default: old: Expected N to equal 0 new: Command failed with exit status N new: Unexpected warnings seen on stderr: "...." Adding fro the ExitCleanOnly function that is present in some tests that were cherry picked for this PR. Signed-off-by: Ed Santiago <santiago@redhat.com> (cherry picked from commit 6cbd17c) Signed-off-by: Tom Sweeney <tsweeney@redhat.com> (cherry picked from commit a9ac512) Signed-off-by: Chris Evich <cevich@redhat.com>
Member
|
@cevich need this one actually: 0c18beaea7 . Also, remove |
This significantly simplifies the ceromony of running a Podman command
in integration tests, from
> session := p.Podman([]string{"stop", id})
> session.WaitWithDefaultTimeout()
> Expect(session).Should(ExitCleanly())
to
> p.PodmanExitCleanly("stop", id)
There are >4650 instances of ExitCleanly() in the tests,
and many could be migrated; this does not do that.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
(cherry picked from commit 0c18bea)
Conflicts resolved with the assistance of AI: Cursor <auto>
Signed-off-by: Chris Evich <cevich@redhat.com>
Member
Author
|
Backported, conflicts resolved by AI in favor of ginkgo v1. Both tests and project compiles fine. I did not run any tests though. |
lsm5
approved these changes
Apr 13, 2026
Member
lsm5
left a comment
lsm5
left a comment
There was a problem hiding this comment.
Integration tests compiled successfully.
LGTM
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Followup to #27933 - Neglected to backport for fixes: https://issues.redhat.com/browse/RHEL-132863 https://issues.redhat.com/browse/RHEL-132860
Checklist
Ensure you have completed the following checklist for your pull request to be reviewed:
commits. (
git commit -s). (If needed, usegit commit -s --amend). The author email must matchthe sign-off email address. See CONTRIBUTING.md
for more information.
Fixes: #00000in commit message (if applicable)make validatepr(format/lint checks)Noneif no user-facing changes)Does this PR introduce a user-facing change?