Commit graph

15026 commits

Author SHA1 Message Date
Jason T. Greene
41e6eff62b Update WSL machine OS to enable user lingering
Also migrate old machines that were missing this setting

Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
2022-06-14 13:41:31 -04:00
SandroCasagrande
1ed47ced1f Robust whitespace split of cpu utilization line from /proc/stat
Signed-off-by: Sandro Casagrande <sc.casagrande@gmail.com>
2022-06-14 13:23:49 -04:00
Daniel J Walsh
ff72a48a66 Make sure tests are cleaned up when they complete
Fixes: https://github.com/containers/podman/issues/13789

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-06-14 13:21:16 -04:00
Ed Santiago
f8d368df9d Fix broken pwd
Broken in #14191, merged unintentionally

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-06-14 13:20:42 -04:00
Valentin Rothberg
431c350b3a [CI:DOCS] fix make localbenchmarks
Since `./hack` has been removed from the Makefile's path, add it back
for `make localbenchmarks` to make `podman-registry` binary available
for running local registries.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-06-14 13:19:15 -04:00
Valentin Rothberg
54d1121c0e sdnotify: send MAINPID only once
Send the main PID only once.  Previously, `(*Container).start()` and
the conmon handler sent them ~simultaneously and went into a race.

I noticed the issue while debugging a WIP PR.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-06-14 13:18:52 -04:00
Ed Santiago
c004978ea8 Fix hang in build-each-commit test
Followup to #14178: I broke CI. "--fork-point" does not do
what I thought it did, so remove it.

Also, add 'set -x' to help us debug the next time something
like this happens.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-06-14 13:16:35 -04:00
Giuseppe Scrivano
2ac61ebfee test: update fedora toolbox image
f32 is already EOL.  Let's use the latest version.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-06-14 13:16:21 -04:00
Ed Santiago
f58be889e3 [CI:DOCS] man pages: fix inconsistencies
As part of work done in #14046, fix bugs found in man pages,
basically just moving a few descriptions to the right place
and removing some undesired asterisks.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-06-14 13:16:05 -04:00
Ashley Cui
28e7be1c24 Add more machine tests
Add more machine tests for flags in init, inspect, and list.

Signed-off-by: Ashley Cui <acui@redhat.com>
2022-06-14 13:15:43 -04:00
Giuseppe Scrivano
a554ff48eb test: simplify cleanup code
do not try to first stop and then rm but combine the two operations in
a single command.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-06-14 13:15:19 -04:00
Chris Evich
88a7ce7d51 Cirrus: Guarantee $DEST_BRANCH is passed through
There are several runtime contexts (rootless and container) where
`$DEST_BRANCH` is needed but was not supplied.  A prior commit
(c486576717) removed the default value, `main` which was being
set incorrectly when CI ran on release branches.  Fix this by ensuring
the variable is non-empty upon entry to `setup_environment.sh`, then
ensure it gets passed through to child environments by way of the
`/etc/ci_environment` file.  This will maintain compatibility with
both CI and `hack/get_ci_vm.sh` use.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-06-14 13:15:05 -04:00
Chris Evich
484f1834ab Cirrus: Fix Makefile including 'hack' in $PATH
This path should never, ever, ever be included in `$PATH` as it is
almost guaranteed to cause serious and non-obvious breakage in CI.  Fix
it and include a warning comment.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-06-14 13:14:40 -04:00
Ed Santiago
ce407828d0 bloat check: make more robust
The use of 'C^' (parent) in 'git rebase' is counterintuitive,
at least to me: when C is a merge of multiple commits, rebase
picks each of those commits. That probably makes good sense
to a git expert, which I'm not.

Solution: forget using '^', just calculate the baseline sizes
by doing a checkout of the PR's parent.

Also: compute PR parent using git-merge-base instead of
blindly trusting $DEST_BRANCH (which may be volatile as
other PRs are merged).

Also: run git-rebase directly, not via make rule. That
indirection is too confusing here.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-06-14 13:14:15 -04:00
ttyS3
42e70a0c94 fix: Container.cGroupPath() skip empty line to avoid false error logging
Signed-off-by: ttyS3 <ttys3.rust@gmail.com>

[NO NEW TESTS NEEDED]
2022-06-14 13:11:47 -04:00
Paul Holzinger
4cc2ce0898 fix broken CI test
Commit b58e7e7f11 was not fully rebased before merging and is now
breaking CI because commit 69c479b16e made the underlying error
visible. Using journald inside the container tests is not supported.

Fixes #14162

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-06-14 13:10:33 -04:00
cdoern
8a7e280945 play kube log tag handling
currently tags cause a panic due to an uninitialized map. Initialize the map
and add parsing to make sure we are only tagging with journald

resolves #13356

Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
2022-06-14 13:08:53 -04:00
OpenShift Merge Robot
a1ec21dac1
Merge pull request #14337 from openshift-cherrypick-robot/cherry-pick-14294-to-v4.1
[v4.1] fix compat image resolution
2022-05-24 09:13:48 -04:00
Valentin Rothberg
1021afb6b0 fix compat image resolution
Fix a bug in the resolution of images in the Docker compat API.
When looking up an image by a short name, the name may match
an image that does not live on Docker Hub.  The resolved name
should be used for normalization instead of the input name to
make sure that `busybox` can resolve to `registry.com/busybox`
if present in the local storage.

Fixes: #14291
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-05-24 07:42:37 +00:00
OpenShift Merge Robot
d537cf1de3
Merge pull request #14328 from cevich/v4.1_fix_netavark-aardvark
[v4.1] Cirrus: Remove unused netavark/aardvark variables
2022-05-24 03:19:33 -04:00
Chris Evich
aa25650e61
Cirrus: Remove unused netavark/aardvark variables
CI on the `v4.1` branch uses netavark & aardvark-dns packages built into
the VM images.  However there were several leftover env. var.
definitions from a previous solution, which may be confusing to future
maintainers.  Delete them.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-05-23 12:18:53 -04:00
OpenShift Merge Robot
12d30e63f0
Merge pull request #14280 from vrothberg/4.1-backport
[v4.1] [BZ #2083997] pod: build pause image in custom user NS
2022-05-18 08:51:01 -04:00
Valentin Rothberg
fe29196ba8 [BZ #2083997] pod: build pause image in custom user NS
Use the host UID and host GID mapping when building the local pause
image for a Pod with a custom mapping.  Otherwise, the mappings are off
and the build fails. Propagating the mapping to the build container is
not needed since the pause image ships merely a copied `catatonit` from
the host.

Backport-of: commit c45d51899a
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2083997
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-05-18 08:52:09 +02:00
OpenShift Merge Robot
1cb638c1bc
Merge pull request #14157 from edsantiago/test_skip_fix
[v4.1] test skipper: check for $DEST_BRANCH
2022-05-17 15:17:14 +02:00
OpenShift Merge Robot
cedbbfa543
Merge pull request #14247 from n1hility/machine-event-win-41
[v4.1] Cherry-pick windows machine events
2022-05-16 12:32:50 +02:00
Jason T. Greene
4ae7161c4c Fix strange buildtag edit
Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
2022-05-15 12:01:38 -05:00
Jason T. Greene
44d253b6c0 Add support for machine events on Windows
Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
2022-05-15 12:01:05 -05:00
Ed Santiago
4fe115094c test skipper: check for $DEST_BRANCH
The test-skipping optimization is failing as rootless on non-main,
because $DEST_BRANCH is not set. Solution: check for envariable,
skip test if missing. (This was part of my original PR, but was
accidentally removed in #14013)

Also: DEST_BRANCH was silently being defaulted to 'v4.1' in lib.sh.
Remove that: per @cevich, it is no longer necessary.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-05-10 05:47:15 -06:00
OpenShift Merge Robot
a87bba317e
Merge pull request #14164 from openshift-cherrypick-robot/cherry-pick-14152-to-v4.1
[v4.1] test: fix "podman search format json"
2022-05-10 03:21:33 -04:00
Giuseppe Scrivano
8e3a991ff6 test: fix "podman search format json"
the alpine image used previously returns a description that contains
'...':

$ podman search --format json alpine | fgrep ...\"\,
        "Description": "alpine 3.7 with bash, perl, gzip, wget...",

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-05-09 18:04:39 +00:00
OpenShift Merge Robot
f40474521b
Merge pull request #14132 from mheon/bump_410
Bump to v4.1.0
2022-05-06 09:27:17 -04:00
Matthew Heon
ab4d33e146 Update README for 4.1.0 release
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-05-05 17:14:34 -04:00
Matthew Heon
3b4de8efc3 Bump to v4.1.1-dev
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-05-05 16:08:08 -04:00
Matthew Heon
e4b0390205
Bump to v4.1.0
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-05-05 16:07:47 -04:00
Matthew Heon
e87b07f7c7 Release notes for v4.1.0 final
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-05-05 16:07:06 -04:00
cdoern
a8b55a3b9f pass networks to container clone
since the network config is a string map, json.unmarshal does not recognize
the config and spec as the same entity, need to map this option manually

resolves #13713

Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
2022-05-05 16:02:00 -04:00
Brent Baude
b2025c64f4 Add more unit tests
Improve "code coverage" with more unit-tests.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2022-05-05 15:48:26 -04:00
Giuseppe Scrivano
7b64cd7835 libpod: treat ECONNRESET as EOF
when reading from the attach socket, treat ECONNRESET in the same way
as EOF.

[NO NEW TESTS NEEDED]

Closes: https://github.com/containers/podman/issues/11446

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-05-05 15:44:50 -04:00
Niall Crowe
6d1d6cc0b2 play kube default log driver
The default log driver is not used when using play kube
without --log-driver. The LogDriver function needs to
be called in order to use the default log driver.

fixes #13781
Signed-off-by: Niall Crowe <nicrowe@redhat.com>
2022-05-05 15:43:31 -04:00
OpenShift Merge Robot
83ef2c721a
Merge pull request #14127 from rhatdan/v4.1
Vendor in containers/buildah@v1.26.1
2022-05-05 15:40:19 -04:00
Chris Evich
d57bbdb5cd
Cirrus: Fix ownership of repos. to keep git happy
Newer versions of git are much more pedantic about who owns the
repository files.  When setting up to run rootless, prior to this
commit, the repo. ownership was changed from root.  This causes
all subsequent git-operations as root to fail:

    ```
    fatal: unsafe repository ('<$GOSRC>' is owned by someone else)
    ```

Fix this by re-ordering operations, such that the change in ownership is
done immediately before executing as a user.  Also disable the
git-ownership check on the source repository assuming the CI environment
is disposable.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-05-05 13:52:09 -04:00
Aditya R
4716b6b1b2
build: disable --output for podman-remote clients
Disable `build --output` for remote clients and update docs.

[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

Signed-off-by: Aditya R <arajan@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-05-05 13:52:09 -04:00
Daniel J Walsh
fbab06796a
Vendor in containers/buildah@v1.26.1
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-05-05 13:52:09 -04:00
Chris Evich
ee4e0aa43e
Temporarily skip netavark/aardvark e2e test
Ref: https://github.com/containers/podman/issues/13931

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-05-05 13:50:07 -04:00
Chris Evich
8b897a586e
Cirrus: Temporarily update netavark/aardvark-dns
Normally installing/updating packages at test runtime is highly
discouraged for reliability and efficiency reasons.  However, in this
specific case, development work of these packages is still fairly hot.
As a compromise to support podman test development, temporarily update
these two specific packages at runtime.  At a future date, when updates
are less frequent, this commit can/should be safely reverted.  At that
point, the versions installed at VM image build time will persist.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-05-05 13:49:36 -04:00
Chris Evich
b73bdcdb90
Cirrus: Test w/ netavark/aardvark-dns in F36+
Now that netavark and aardvark are packaged and default in F36, support
CNI-based testing in F35 and Ubuntu.

* Remove the temporary/special `$TEST_ENVIRON=host-netavark` construct.
* Remove dedicated/special integration and system testing tasks.
* Update test-config setup to properly handle CNI vs netavark/aardvark
  environments.
* Update package-version logging to operate based on installed packages
  (along with some other minor script cleanups).
* Update global environment setup to force `$NETWORK_BACKEND=netavark`
  in F36 and later.  Except when `upgrade_test` task runs.
* Discontinue installing netavark and aardvark-dns binaries from
  upstream build artifacts.
* Drop CGV1-vs-2 policy check.  Ubuntu VMs now exclusively test CGv1,
  Fedora VMs test CGv2, with F35 testing CNI and F36 testing Netavark.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-05-05 13:48:13 -04:00
Chris Evich
80cf4e31c9
Cirrus: Update to F36 CI VM Images
Signed-off-by: Chris Evich <cevich@redhat.com>
2022-05-05 13:45:05 -04:00
OpenShift Merge Robot
8081d921b2
Merge pull request #14119 from openshift-cherrypick-robot/cherry-pick-14037-to-v4.1
[v4.1]  Report correct RemoteURI
2022-05-05 04:44:35 -04:00
OpenShift Merge Robot
a3908b009a
Merge pull request #14116 from mheon/bump_410_rc2
[CI:DOCS] Bump to v4.1.0-RC2
2022-05-04 15:59:10 -04:00
OpenShift Merge Robot
6e8f6370b8
Merge pull request #14117 from openshift-cherrypick-robot/cherry-pick-14066-to-v4.1
[v4.1] podman system reset removed machines incorrectly
2022-05-04 15:57:23 -04:00