Cirrus: use test-integration target

.cirrus.yml

@@ -26,7 +26,7 @@
     # 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}"
 
@@ -77,7 +77,7 @@
       "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" build
       "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" doccheck
 
 osx_task:
     # Don't run for docs-only builds.
     # Also don't run on release-branches or their PRs,
     # since base container-image is not version-constrained.
@@ -116,7 +116,7 @@
         task_cleanup_script: *mac_cleanup
 
 
 cross_task:
     alias: cross
     only_if: >-
         $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
@@ -139,7 +139,7 @@
         "${GOSRC}/${SCRIPT_BASE}/runner.sh" cross
 
 
 ostree-rs-ext_task:
     alias: proxy_ostree_ext
     only_if: *not_docs_or_release_branch
     # WARNING: This task potentially performs a container image
@@ -180,7 +180,7 @@
 ##### repository's `.cirrus.yml`.  Changes made here should be fully merged
 ##### prior to being manually duplicated and maintained in containers/image.
 #####
 test_skopeo_task:
     alias: test_skopeo
     # Don't test for [CI:DOCS], [CI:BUILD].
     only_if: >-
@@ -253,7 +253,7 @@
 # Status aggregator for all tests.  This task simply ensures a defined
 # set of tasks all passed, and allows confirming that based on the status
 # of this task.
 success_task:
     name: "Total Success"
     alias: success
     # N/B: ALL tasks must be listed here, minus their '_task' suffix.

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
 
 

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() {