Skip to content

Conversation

@nalind
Copy link
Member

@nalind nalind commented Dec 9, 2025

Ignore me!

Also update containers/storage to handle changes in the runc API.

Fixes: https://issues.redhat.com/browse/RHEL-126918

Signed-off-by: David Shea <dshea@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@openshift-ci openshift-ci bot added the approved label Dec 9, 2025
@nalind nalind force-pushed the ci-1.21 branch 3 times, most recently from 2752931 to e951ec9 Compare December 9, 2025 21:34
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 9, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nalind

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@nalind nalind force-pushed the ci-1.21 branch 6 times, most recently from 224f7fc to 1c635f1 Compare December 10, 2025 16:09
nalind and others added 6 commits December 11, 2025 15:20
The updated libcontainer (part of runc) doesn't compile as cleanly on
non-Linux platforms.  We could work around some of the types not being
defined on those platforms, as we do in later branches, but for now, and
unless we need to for downstream consumers, this gets us to passing CI
faster.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Update the versions of ginkgo that we build for use by our e2e tests,
and the linter.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: David Shea <dshea@redhat.com>
Signed-off-by: David Shea <dshea@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@nalind nalind force-pushed the ci-1.21 branch 6 times, most recently from 5da61d8 to 4f073e0 Compare December 11, 2025 22:40
dashea and others added 2 commits December 11, 2025 18:09
Signed-off-by: David Shea <dshea@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
The github.com/pkg/errors.Cause() function didn't call Unwrap(), so
directly comparing its returned value with specific errors could fail.
Compensate for that by using errors.Is() or errors.As() where possible.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@nalind nalind force-pushed the ci-1.21 branch 2 times, most recently from 1639e51 to 36d9ffe Compare December 12, 2025 19:46
When firing up a minimal server to serve up content so that we can
retrieve it using HTTP, make it possible to let the kernel assign us
which port to use, so that the script that's calling us doesn't have to
make a(n occasionally bad) guess.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@nalind nalind force-pushed the ci-1.21 branch 4 times, most recently from 3ac390e to faa3f29 Compare December 12, 2025 22:05
nalind and others added 22 commits December 12, 2025 19:16
Update linter configuration to more closely align with main.  Address
some linter warnings, mark some others to be ignored.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Ambient capabilities can't be raised without inheritable ones, and since we
don't raise inheritable, we should not raise ambient either.

This went unnoticed because of a bug in syndtr/gocapability which is
only fixed in its fork (see the next commit).

Amends commit e7e55c9.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Signed-off-by: Chris Evich <cevich@redhat.com>
Assisted-by: Claude (Anthropic)
Newer docker build doesn't set it, so we need to stop.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Make setting the Parent field in the config blob of a docker format
image optional (yes, we're bringing it back!), since it no longer
appears to be set by newer versions of docker build.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
If the working directory ends with the path separator, and trimming it
wouldn't produce an empty value, trim it, for conformance.

This was originally fixed in imagebuilder, and we picked up the change
automatically, but this should provide the same end-result.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Add descriptions to man pages for the flags which the updated versions
of library dependencies have added.  Hide the default "completion"
command.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Make "build" an alias for "bud", as in later releases we renamed it to
"build" and kept "bud" as an alias.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Update the error messages that various tests expect, which have been
changed by the libraries that produce them.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
The -cover flag causes many 'error: coverage... ; no coverage data written'
messages when GOCOVERDIR is not set. These messages needlessly clutter the test output.  Remove the -cover flag.

Signed-off-by: Chris Evich <cevich@redhat.com>
Assisted-by: Claude (Anthropic)
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Also update the tests to account for the changes when pulling from the
dir transport.  Images pulled via the dir transport are not tagged
anymore; the path is not a reliable source.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Run tests using the seccomp profile that we use by default, which
differs from the one that the runtime-tools generator supplies if we
don't use our own.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Use sort.Stable() instead of sort.Sort() to sort mounts, and have the
comparison function compare the cleaned paths directly if they have the
same number of components, so that there's a defined ordering between
"/a" and "/b".

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Backport a fixup of the permissions of the testing git repository that
we use when checking that we can clone repositories when building,
because I generated the tarball of the contents with myself as the
owner, instead of root, and newer git thinks that looks suspect.

Ed fixed this on main a while ago.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Handle requested relabeling of bind mounts (i.e., the "z" and "Z" flags)
directly, instead of letting the runtime handle the relabeling.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

Signed-off-by: Chris Evich <cevich@redhat.com>
Assisted-by: Claude (Anthropic)
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Use the named constants for the status values that runtimes can report
to us when we run them with the "state" command.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Pick up the test updates from containers#4829, where we learned that disabling
SELinux process labeling in a non-privileged context doesn't result in
the container process being granted super privileges.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
When checking the not-standardized "architecture" label in the ubi8 base
image, accept either the RPM-recognized value (x86_64, aarch64) or Go
value (amd64, arm64), because it seems to have changed at least once.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Add /usr/lib/cni, which is where Debian packages
containernetworking-plugins, to the default set of paths we search for
CNI plugins.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
When checking that the /etc/hosts entry that we add looks right, accept
either tabs or spaces separating the IP address from the hostname, since
we actually use tabs.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: David Shea <dshea@redhat.com>
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants