From 8c4af36e9e46e252eec380e374714b85d76e4178 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 17 Oct 2025 09:11:49 -0400 Subject: [PATCH 1/2] Cirrus: use test-integration target Signed-off-by: Lokesh Mandvekar --- .cirrus.yml | 2 +- contrib/cirrus/runner.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index c3bf0765d5..ae737d639b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -26,7 +26,7 @@ env: # package is not available in earlier releases; once we update to a future # Fedora release (or if the package is backported), switch back from Rawhide # to the latest Fedora release. - IMAGE_SUFFIX: "c20250910t092246z-f42f41d13" + IMAGE_SUFFIX: "c20251016t194444z-f42f41d13" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" RAWHIDE_CACHE_IMAGE_NAME: "rawhide-${IMAGE_SUFFIX}" diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 3ec9f49c13..093df2755a 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -121,7 +121,7 @@ _podman_reset() { _run_integration() { _podman_reset - make test-integration-local BUILDTAGS="$BUILDTAGS" + make test-integration BUILDTAGS="$BUILDTAGS" } _run_system() { From f1ef1bfd7b5ce29a35b76fed86e5638eda74b909 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 25 Oct 2025 16:02:16 -0400 Subject: [PATCH 2/2] Makefile: run skopeo_cidev targets with cap_sys_admin Signed-off-by: Lokesh Mandvekar --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1262cb3646..385892891c 100644 --- a/Makefile +++ b/Makefile @@ -197,7 +197,7 @@ test-integration: # This is intended to be equal to $(CONTAINER_RUN), but with --cap-add=cap_mknod. # --cap-add=cap_mknod is important to allow skopeo to use containers-storage: directly as it exists in the callers’ environment, without # creating a nested user namespace (which requires /etc/subuid and /etc/subgid to be set up) - $(CONTAINER_CMD) --security-opt label=disable --cap-add=cap_mknod -v $(CURDIR):$(CONTAINER_GOSRC) -w $(CONTAINER_GOSRC) $(SKOPEO_CIDEV_CONTAINER_FQIN) \ + $(CONTAINER_CMD) --security-opt label=disable --cap-add=cap_mknod,cap_sys_admin -v $(CURDIR):$(CONTAINER_GOSRC) -w $(CONTAINER_GOSRC) $(SKOPEO_CIDEV_CONTAINER_FQIN) \ $(MAKE) test-integration-local