Commit Graph

6065 Commits

Author SHA1 Message Date
Matt Heon bd62d5afc7 Switch to the CNCF Code of Conduct
As part of the CNCF Sandbox, we are replacing our existing COC
with the standard CNCF version.

Signed-off-by: Matt Heon <mheon@redhat.com>
2025-02-10 14:40:48 -05:00
openshift-merge-bot[bot] f89450213c
Merge pull request #5978 from nalind/cache-ownership
Distinguish --mount=type=cache locations by ownership, too
2025-02-10 19:31:25 +00:00
openshift-merge-bot[bot] a35f5fa04d
Merge pull request #5979 from flouthoc/bump-ci-resources
.cirrus: bump ci resources
2025-02-10 18:58:23 +00:00
flouthoc 03cd7821c9
.cirrus: bump ci resources
Timeplot of various tests after the resource bump

>> 28:49
| type        | user     | fs      |      d13 |      f40 |      f41 |
| ----------- | -------- | ------- | -------- | -------- | -------- |
| Unit        | root     | vfs     |          |    08:22 |          |
| Unit        | root     | overlay |          |    08:18 |          |
| Conformance | root     | vfs     |    20:52 |          |          |
| Conformance | root     | overlay |    11:55 |          |          |
| Integration | root     | vfs     |    19:15 |    17:36 |    17:18 |
| Integration | root     | overlay |    15:14 |          |    20:52 |
| Integration | rootless | overlay |    17:27 |          |    17:06 |

Timeplot of various tests before the test bump from PR #5978

>> 01:03:34
| type        | user     | fs      |      d13 |      f40 |      f41 |
| ----------- | -------- | ------- | -------- | -------- | -------- |
| Unit        | root     | vfs     |          |    08:31 |          |
| Unit        | root     | overlay |          |    08:15 |          |
| Conformance | root     | vfs     |    24:30 |          |          |
| Conformance | root     | overlay |    14:27 |          |          |
| Integration | root     | vfs     |    25:40 |    28:08 |    26:19 |
| Integration | root     | overlay |    23:15 |          |    24:10 |
| Integration | rootless | overlay |    27:01 |          |    28:46 |

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-02-10 06:54:41 -08:00
Nalin Dahyabhai 24826435f8 Distinguish --mount=type=cache locations by ownership, too
Normally, we select and distinguish --mount=type=cache directories that
we create by either the "id" or "target" value used when mounting them,
but we should also be distinguishing them by the "uid" and "gid" flags,
or lack thereof.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-02-07 13:38:56 -05:00
openshift-merge-bot[bot] a3701cb97d
Merge pull request #5972 from containers/renovate/golang.org-x-term-0.x
fix(deps): update module golang.org/x/term to v0.29.0
2025-02-06 14:53:30 +00:00
renovate[bot] 4b234a19c1
fix(deps): update module golang.org/x/term to v0.29.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-06 00:03:05 +00:00
openshift-merge-bot[bot] d5ed8b4788
Merge pull request #5954 from flouthoc/parallel-unit-test
CI: parallize unit tests
2025-02-05 21:28:43 +00:00
flouthoc 147a3ca916
.cirrus: run -race only on non-PR branch
Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-02-05 06:57:14 -08:00
flouthoc de3c3baf09
unit: deparallize some tests
See issue: https://github.com/containers/buildah/issues/5967

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-02-04 11:07:43 -08:00
flouthoc 81479b200c
.cirrus: use multiple cpu for unit tests
Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-02-04 11:07:36 -08:00
flouthoc 1879f3dc65
Makefile: use -parallel for go test
Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-02-04 11:07:27 -08:00
flouthoc aadfc5cf30
unit_test: use Parallel test where possible
Add `t.Parallel()` to unit tests whereever its possible without race.

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-02-04 11:07:15 -08:00
openshift-merge-bot[bot] ae5e123314
Merge pull request #5970 from containers/renovate/golang.org-x-sys-0.x
Update module golang.org/x/sys to v0.30.0
2025-02-04 17:53:15 +00:00
renovate[bot] 3f9bc73d59
Update module golang.org/x/sys to v0.30.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-04 16:08:05 +00:00
openshift-merge-bot[bot] 30bf35f3f1
Merge pull request #5969 from containers/renovate/golang.org-x-sync-0.x
Update module golang.org/x/sync to v0.11.0
2025-02-04 16:05:52 +00:00
renovate[bot] 04febc5813
Update module golang.org/x/sync to v0.11.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-04 14:39:20 +00:00
openshift-merge-bot[bot] 324df7da73
Merge pull request #5966 from containers/renovate/major-ci-vm-image
Update dependency containers/automation_images to v20250131
2025-02-03 21:24:54 +00:00
renovate[bot] a13fa87ea2
Update dependency containers/automation_images to v20250131
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-02-03 17:03:29 +00:00
openshift-merge-bot[bot] 53872d88fa
Merge pull request #5962 from TomSweeneyRedHat/dev/tsweeney/1.39.0
Bump Buildah to v1.39.0, c/storage v1.57.1, c/image v5.34.0, c/common v0.62.0
2025-02-03 15:54:59 +00:00
tomsweeneyredhat 6c3d7546e3 Bump to Buildah v1.40.0-dev
Bumping back to a dev version.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-01-31 18:19:08 -05:00
tomsweeneyredhat c15ab104a1 Bump to Buildah v1.39.0
Bump to Buildah v1.39.0 in preparation
for Podman v5.4

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-01-31 18:15:22 -05:00
tomsweeneyredhat 298a64106e Bump c/storage v1.57.1, c/image 5.34.0, c/common v0.62.0
Bump:
c/storage to v1.57.1
c/image   to v5.34.0
c/common  to v0.62.0

in preparation for Podman v5.4

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-01-31 18:06:51 -05:00
openshift-merge-bot[bot] 2fe355bb15
Merge pull request #5957 from containers/renovate/github.com-containers-storage-1.x
Update module github.com/containers/storage to v1.57.0
2025-01-30 19:50:07 +00:00
renovate[bot] 3c7c611c7a
Update module github.com/containers/storage to v1.57.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-30 17:11:15 +00:00
openshift-merge-bot[bot] 607ca3065c
Merge pull request #5947 from flouthoc/containerized_integration_parallel
CI, .cirrus: parallelize containerized integration
2025-01-29 12:22:08 +00:00
flouthoc d11bd71f43
CI, .cirrus: parallelize containerized integration
[NO NEW TESTS NEEDED]

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-01-27 12:43:20 -08:00
openshift-merge-bot[bot] 042414a056
Merge pull request #5552 from edsantiago/bats-parallel
bats tests - parallelize
2025-01-27 20:38:36 +00:00
flouthoc bd2d78e408
ed's comment: cleanup
Address comment here for cleanup https://github.com/containers/buildah/pull/5552#discussion_r1854283414

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-01-25 11:25:09 -08:00
flouthoc ea39556a6f
use seperate blobinfocache for flaky test
Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-01-25 08:14:27 -08:00
Ed Santiago 72161b3a14
bump CI VMs to 4 CPUs (was: 2) for integration tests
Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-01-25 08:09:16 -08:00
Ed Santiago 56078ef2d6
cleanup, debug, and disable parallel in blobcache tests
Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-01-25 08:09:11 -08:00
Ed Santiago 708fe0aff5
bats tests - parallelize
All bats tests run with custom root/runroot, so it should be
possible to parallelize them.

Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-01-25 08:09:05 -08:00
openshift-merge-bot[bot] 92015b7f43
Merge pull request #5927 from nalind/overlay-cleanups
pkg/overlay: cleanups
2025-01-25 11:41:11 +00:00
openshift-merge-bot[bot] e08082fa22
Merge pull request #5691 from flouthoc/burst-cache-mount
build, run: record hash or digest in image history for sources used in `--mount`
2025-01-25 11:35:40 +00:00
Nalin Dahyabhai 670a7bec6e pkg/overlay: cleanups
Change generateOverlayStructure() to not return its first argument
unchanged, since both of its callers already have that value, and adjust
a few error messages.

In the Linux MountWithOptions(), ensure that, if UpperDirOptionFragment
and WorkDirOptionFragment values were specified, they are absolute
paths, otherwise place them under the top-level parent of the various
directories we have for this mount.

Update a number of comments.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-01-24 15:54:08 -05:00
openshift-merge-bot[bot] 21fe6dcf1f
Merge pull request #5929 from Luap99/vendor
vendor to latest c/{common,image,storage}
2025-01-24 18:35:31 +00:00
openshift-merge-bot[bot] 865427c61e
Merge pull request #5938 from lsm5/rpm-gobuild-macro
[skip-ci] RPM: use default gobuild macro on RHEL
2025-01-24 15:50:29 +00:00
Lokesh Mandvekar ca957c4878
RPM: include check section to silence rpmlint
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2025-01-24 17:02:05 +05:30
Lokesh Mandvekar 6cee07f52e
RPM: use default gobuild macro on RHEL
The default gobuild macro on RHEL now includes support for BUILDTAGS. So
we don't need to redefine it here.

`libtrust_openssl` buildtag will be set in the spec file for RHEL environments.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2025-01-24 16:43:03 +05:30
Paul Holzinger 2119c8da3c
tests: remove masked /sys/dev/block check
The c/common defaults were changed to no longer mask this path[1]. As
such we need to remove it from this test.

[1] https://github.com/containers/common/pull/2278

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-01-24 11:45:28 +01:00
Paul Holzinger 4887a4fb1b
vendor to latest c/{common,image,storage}
Make sure all the test pass before we do a final vendor dance.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-01-24 11:45:26 +01:00
flouthoc 4383e34c0f
build, run: record hash or digest in image history
When using `--mount=type=bind` or `--mount=type=cache` the hash or
digest of source in these flags should be added to image history so
buildah can burst cache if files on host or image which is being used as
source is changed.

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
2025-01-23 15:44:07 -08:00
openshift-merge-bot[bot] a7fe4793a8
Merge pull request #5934 from nalind/cache-mount-images
Accept image names as sources for cache mounts
2025-01-23 22:28:05 +00:00
Nalin Dahyabhai 3541a3ce2a Accept image names as sources for cache mounts
Allow the "from" option for cache mounts to refer to an image, which, if
we attempt to mount read-write, is mounted using an overlay to avoid
getting errors if the process we're running with the cache mount
attempts to write to it.

Add logic to clean up the bind mount in Builder.getBindMount() that's
triggered if Builder.runSetupVolumeMounts() returns an error.

When creating cache directories for cache mounts, process the
container's ID mappings.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-01-23 13:38:02 -05:00
openshift-merge-bot[bot] ea50c7be71
Merge pull request #5924 from nalind/run-cleanup
Run(): always clean up options.ExternalImageMounts
2025-01-23 18:12:05 +00:00
openshift-merge-bot[bot] 0c4864e676
Merge pull request #5937 from Juneezee/refactor/exp
refactor: replace `golang.org/x/exp` with stdlib
2025-01-23 17:44:36 +00:00
Nalin Dahyabhai 9e00b6b399 Run(): always clean up options.ExternalImageMounts
Make sure that we consistently unmount the list of images that we're
told to, even in cases where we return an error before arranging to do
so in Run().

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2025-01-23 11:29:28 -05:00
Eng Zer Jun 59024c41ad
refactor: replace golang.org/x/exp with stdlib
These experimental packages are now available in the Go standard
library since Go 1.21:

	1. golang.org/x/exp/slices -> slices [1]
	2. golang.org/x/exp/maps -> maps [2]

[1]: https://go.dev/doc/go1.21#slices
[2]: https://go.dev/doc/go1.21#maps

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
2025-01-24 00:27:55 +08:00
openshift-merge-bot[bot] b48b0fce4c
Merge pull request #5932 from mtrmac/c-image-tests
Update c/image and update tests
2025-01-23 16:18:33 +00:00