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

Final Backports and Bump to v4.2.0 #15279

Merged
merged 31 commits into from
Aug 11, 2022

Conversation

mheon
Copy link
Member

@mheon mheon commented Aug 10, 2022

As the title says.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 10, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mheon

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 10, 2022
@mheon mheon added test_podman_machine Cause cirrus-ci to execute podman_machine tests and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 10, 2022
@TomSweeneyRedHat
Copy link
Member

@mheon all kinds of test unhappiness....

@mheon
Copy link
Member Author

mheon commented Aug 10, 2022

It's all checkpoint/restore stuff, in a test that AFAIK has not changed for 2 years...

@mheon
Copy link
Member Author

mheon commented Aug 10, 2022

Aha, nevermind. I backported a commit that enabled more tests; must not be working yet on this branch.

@mheon
Copy link
Member Author

mheon commented Aug 10, 2022

Re-pushed, hopefully will work now

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 10, 2022
@mheon
Copy link
Member Author

mheon commented Aug 10, 2022

I don't see the machine tests running. @baude @cevich Am I just missing them?

flouthoc and others added 18 commits August 10, 2022 16:46
Bump buildah to v1.27.0

[NO NEW TESTS NEEDED]

Signed-off-by: Aditya R <[email protected]>
[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

Signed-off-by: Aditya R <[email protected]>
Skip some newly added test for remote and modify error output of a test
case which is reporter early in case of podman.

[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

Signed-off-by: Aditya R <[email protected]>
This Patch will cause podman COMMAND rm --force bogus not fail

This is how Docker works, so Podman should follow this to allow existing
scripts to convert from Docker to Podman.

Fixes: containers#14612
Oprignal version of this patch came from wufan [email protected]

Signed-off-by: Daniel J Walsh <[email protected]>
If there is a match for both container and image, we restore the container.

Fixes: containers#15055

Signed-off-by: Toshiki Sonoda <[email protected]>
This bug is reproduced when we execute the following command:

1. podman manifest add <manifest list> <images exist on local storage>
2. podman manifest push --rm <manifest list> dir:<directory>

If pushing succeeds, it is expected to remove only a manifest list.
However, manifest list remains on local storage and images are removed.

This commit fixes `podman manifest push --rm` to remove only a manifest list.

And, supports `manifest push --rm option` in remote environment,
like host environment.

Fixes: containers#15033

Signed-off-by: Toshiki Sonoda <[email protected]>
Allow the cleanup process (and others) to transition the container from
`stopping` to `exited`.  This fixes a race condition detected in containers#14859
where the cleanup process kicks in _before_ the stopping process can
read the exit file.  Prior to this fix, the cleanup process left the
container in the `stopping` state and removed the conmon files, such
that the stopping process also left the container in this state as it
could not read the exit files.  Hence, `podman wait` timed out (see the
23 seconds execution time of the test [1]) due to the unexpected/invalid
state and the test failed.

Further turn the warning during stop to a debug message since it's a
natural race due to the daemonless/concurrent architecture and nothing
to worry about.

[NO NEW TESTS NEEDED] since we can only monitor if containers#14859 continues
flaking or not.

[1] https://storage.googleapis.com/cirrus-ci-6707778565701632-fcae48/artifacts/containers/podman/6210434704343040/html/sys-remote-fedora-36-rootless-host.log.html#t--00205

Fixes: containers#14859
Signed-off-by: Valentin Rothberg <[email protected]>
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.1.11 to 0.1.12.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.1.11...v0.1.12)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Fixes containers#15049

Signed-off-by: Daniel J Walsh <[email protected]>

<MH: Fixed cherry-pick conflicts>

Signed-off-by: Matthew Heon <[email protected]>
Bumps [google.golang.org/protobuf](https://github.com/protocolbuffers/protobuf-go) from 1.28.0 to 1.28.1.
- [Release notes](https://github.com/protocolbuffers/protobuf-go/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf-go/blob/master/release.bash)
- [Commits](protocolbuffers/protobuf-go@v1.28.0...v1.28.1)

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
When a container was created with `--sdnotify value` we would remove
this arg instead of using it like with `--sdnotfiy=value`.

Also when the arg is set to ignore we should force conmon in order to
make the resulting Type=notify units work.

Fixes containers#15052

Signed-off-by: Paul Holzinger <[email protected]>
Current directories and files stay the same with the current implementation as long as the tarball does not contain a directories or files with the same name.

Signed-off-by: Felix Stupp <[email protected]>
podman run/create can accept `-h <hostname>` as argument. When parsing
flags -h throws an help requested error from pflag. To prevent this
error we have to define the help flag.

Fixes containers#15124

Signed-off-by: Paul Holzinger <[email protected]>
e2e `mount_rootless_test` did not load `podman binary path` successfully.
This PR fix this problem.

[It] podman unshare podman mount:
```
[+1596s] Running: ... unshare  mount <cid>
[+1596s] Error: exec: no command
[+1596s] output:
```

[It] podman unshare image podman mount:
```
[+1599s] Running: ... unshare  image mount quay.io/libpod/alpine:latest
[+1599s] Error: exec: no command
[+1599s] output:
```

Signed-off-by: Toshiki Sonoda <[email protected]>
vrothberg and others added 13 commits August 10, 2022 16:46
`--debug` is a NOP and will be hidden in a later commit.

Signed-off-by: Valentin Rothberg <[email protected]>
It's a NOP since Podman v2.0 (containers#5738).

[NO NEW TESTS NEEDED] - does not change behavior.

Fixes: containers#15185
Signed-off-by: Valentin Rothberg <[email protected]>
Fixes: containers#15189

A while ago I updated the only_if/skip options and forgot that several
"cross build" tasks also build documentation in addition to binaries.  Re-enable
them to execute all the time, except when Cirrus-cron is making our
multi-arch images.

Signed-off-by: Chris Evich <[email protected]>
Tying filtering logic for podman stop and start to same place in getContainersAndInputByContext() to reduce code redundancy

Signed-off-by: Karthik Elango <[email protected]>
EL8 builds are failing because hack/markdown-preprocess needs python3
which AFAICT isn't included by default in EL8 build environments.

This commit also includes an additional `[CI:COPR]` mode which is
currently runs the same tests as `[CI:DOCS]` but could differ in future.

Signed-off-by: Lokesh Mandvekar <[email protected]>
`podman run -d mount cleanup test` adapt to rootless environment.

Signed-off-by: Toshiki Sonoda <[email protected]>
if an explicit mapping is specified, do not accept `--userns` since it
overriden to "private".

Closes: containers#15233

Signed-off-by: Giuseppe Scrivano <[email protected]>
use the sandbox id instead of the name for the
io.kubernetes.cri-o.SandboxID annotation used by gVisor.

Closes: containers#15223

[NO NEW TESTS NEEDED] it is specific to gVisor

Signed-off-by: Giuseppe Scrivano <[email protected]>
when verifying that the memory was set correctly for a podman machine
instance, we check if the number is between a range because based on
architecture, operating system, and memory itself this number can differ
significantly.

Signed-off-by: Brent Baude <[email protected]>
Signed-off-by: Matthew Heon <[email protected]>
Signed-off-by: Matthew Heon <[email protected]>
@cevich
Copy link
Member

cevich commented Aug 10, 2022

machine podman fedora-36 rootless host is what you're looking for (in the big list). The current task appears like it will kick off once all the dependencies are met. If not, double-check the task doesn't have a 'trigger' button on it. Lokesh noticed this, even after adding the required PR label.

Note: The label is now gone on main, too much of a pain. I'm completely okay if we want to turn that "feature" off here, should it start causing any trouble. It's a one-line change (IIRC).

@TomSweeneyRedHat
Copy link
Member

LGTM

@TomSweeneyRedHat
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 11, 2022
@openshift-merge-robot openshift-merge-robot merged commit edb3f70 into containers:v4.2 Aug 11, 2022
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 20, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none test_podman_machine Cause cirrus-ci to execute podman_machine tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.