summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix broken pwdEd Santiago2022-06-14
| | | | | | Broken in #14191, merged unintentionally Signed-off-by: Ed Santiago <santiago@redhat.com>
* [CI:DOCS] fix `make localbenchmarks`Valentin Rothberg2022-06-14
| | | | | | | | 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>
* sdnotify: send MAINPID only onceValentin Rothberg2022-06-14
| | | | | | | | | 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>
* Fix hang in build-each-commit testEd Santiago2022-06-14
| | | | | | | | | | 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>
* test: update fedora toolbox imageGiuseppe Scrivano2022-06-14
| | | | | | f32 is already EOL. Let's use the latest version. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* [CI:DOCS] man pages: fix inconsistenciesEd Santiago2022-06-14
| | | | | | | | 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>
* Add more machine testsAshley Cui2022-06-14
| | | | | | Add more machine tests for flags in init, inspect, and list. Signed-off-by: Ashley Cui <acui@redhat.com>
* test: simplify cleanup codeGiuseppe Scrivano2022-06-14
| | | | | | | 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>
* Cirrus: Guarantee $DEST_BRANCH is passed throughChris Evich2022-06-14
| | | | | | | | | | | | | There are several runtime contexts (rootless and container) where `$DEST_BRANCH` is needed but was not supplied. A prior commit (c4865767171b) 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>
* Cirrus: Fix Makefile including 'hack' in $PATHChris Evich2022-06-14
| | | | | | | | 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>
* bloat check: make more robustEd Santiago2022-06-14
| | | | | | | | | | | | | | | | | | | 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>
* fix: Container.cGroupPath() skip empty line to avoid false error loggingttyS32022-06-14
| | | | | | Signed-off-by: ttyS3 <ttys3.rust@gmail.com> [NO NEW TESTS NEEDED]
* fix broken CI testPaul Holzinger2022-06-14
| | | | | | | | | | Commit b58e7e7f11 was not fully rebased before merging and is now breaking CI because commit 69c479b16e19 made the underlying error visible. Using journald inside the container tests is not supported. Fixes #14162 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* play kube log tag handlingcdoern2022-06-14
| | | | | | | | | 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>
* Merge pull request #14337 from ↵OpenShift Merge Robot2022-05-24
|\ | | | | | | | | openshift-cherrypick-robot/cherry-pick-14294-to-v4.1 [v4.1] fix compat image resolution
| * fix compat image resolutionValentin Rothberg2022-05-24
|/ | | | | | | | | | | | 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>
* Merge pull request #14328 from cevich/v4.1_fix_netavark-aardvarkOpenShift Merge Robot2022-05-24
|\ | | | | [v4.1] Cirrus: Remove unused netavark/aardvark variables
| * Cirrus: Remove unused netavark/aardvark variablesChris Evich2022-05-23
|/ | | | | | | | | 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>
* Merge pull request #14280 from vrothberg/4.1-backportOpenShift Merge Robot2022-05-18
|\ | | | | [v4.1] [BZ #2083997] pod: build pause image in custom user NS
| * [BZ #2083997] pod: build pause image in custom user NSValentin Rothberg2022-05-18
|/ | | | | | | | | | | | 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 c45d51899a8190bd3797cdee71b74b912a634c71 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2083997 Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* Merge pull request #14157 from edsantiago/test_skip_fixOpenShift Merge Robot2022-05-17
|\ | | | | [v4.1] test skipper: check for $DEST_BRANCH
| * test skipper: check for $DEST_BRANCHEd Santiago2022-05-10
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #14247 from n1hility/machine-event-win-41OpenShift Merge Robot2022-05-16
|\ \ | |/ |/| [v4.1] Cherry-pick windows machine events
| * Fix strange buildtag editJason T. Greene2022-05-15
| | | | | | | | Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
| * Add support for machine events on WindowsJason T. Greene2022-05-15
|/ | | | Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* Merge pull request #14164 from ↵OpenShift Merge Robot2022-05-10
|\ | | | | | | | | openshift-cherrypick-robot/cherry-pick-14152-to-v4.1 [v4.1] test: fix "podman search format json"
| * test: fix "podman search format json"Giuseppe Scrivano2022-05-09
|/ | | | | | | | | | 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>
* Merge pull request #14132 from mheon/bump_410OpenShift Merge Robot2022-05-06
|\ | | | | Bump to v4.1.0
| * Update README for 4.1.0 releaseMatthew Heon2022-05-05
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Bump to v4.1.1-devMatthew Heon2022-05-05
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Bump to v4.1.0v4.1.0Matthew Heon2022-05-05
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Release notes for v4.1.0 finalMatthew Heon2022-05-05
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * pass networks to container clonecdoern2022-05-05
| | | | | | | | | | | | | | | | | | 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>
| * Add more unit testsBrent Baude2022-05-05
| | | | | | | | | | | | Improve "code coverage" with more unit-tests. Signed-off-by: Brent Baude <bbaude@redhat.com>
| * libpod: treat ECONNRESET as EOFGiuseppe Scrivano2022-05-05
| | | | | | | | | | | | | | | | | | | | | | 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>
| * play kube default log driverNiall Crowe2022-05-05
|/ | | | | | | | | 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>
* Merge pull request #14127 from rhatdan/v4.1OpenShift Merge Robot2022-05-05
|\ | | | | Vendor in containers/buildah@v1.26.1
| * Cirrus: Fix ownership of repos. to keep git happyChris Evich2022-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * build: disable --output for podman-remote clientsAditya R2022-05-05
| | | | | | | | | | | | | | | | | | | | 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>
| * Vendor in containers/buildah@v1.26.1Daniel J Walsh2022-05-05
| | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * Temporarily skip netavark/aardvark e2e testChris Evich2022-05-05
| | | | | | | | | | | | Ref: https://github.com/containers/podman/issues/13931 Signed-off-by: Chris Evich <cevich@redhat.com>
| * Cirrus: Temporarily update netavark/aardvark-dnsChris Evich2022-05-05
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Cirrus: Test w/ netavark/aardvark-dns in F36+Chris Evich2022-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Cirrus: Update to F36 CI VM ImagesChris Evich2022-05-05
|/ | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #14119 from ↵OpenShift Merge Robot2022-05-05
|\ | | | | | | | | openshift-cherrypick-robot/cherry-pick-14037-to-v4.1 [v4.1] Report correct RemoteURI
| * Report correct RemoteURIDaniel J Walsh2022-05-04
| | | | | | | | | | | | | | | | | | | | | | | | Rather than assuming a filesystem path, the API service URI is recorded in the libpod runtime configuration and then reported as requested. Note: All schemes other than "unix" are hard-coded to report URI exists. Fixes #12023 Signed-off-by: Jhon Honce <jhonce@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #14116 from mheon/bump_410_rc2OpenShift Merge Robot2022-05-04
|\ \ | | | | | | [CI:DOCS] Bump to v4.1.0-RC2
| * | Add 4.1 branch to API documentationMatthew Heon2022-05-04
| | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | Misc readme update to retrigger CIMatthew Heon2022-05-04
| | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | Bump to v4.1.0-devMatthew Heon2022-05-04
| | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>