Produce x86_64 & ARM64 fedora container images

.cirrus.yml

@@ -71,13 +71,14 @@ container_images_task: &container_images
     skip: *ci_docs_tooling
     depends_on:
         - image_builder
-    timeout_in: &cntr_timeout 40m
-    gce_instance: &ibi_vm
+    timeout_in: 120m  # emulation is very slow
+    gce_instance:
         image_project: "libpod-218412"
         # Trust whatever was built most recently is functional
         image_family: "image-builder"
         zone: "us-central1-a"
         disk: 200  # Must be 200, negatively affects performance otherwise.
+        type: "c2d-standard-4"  # Extra muscle needed for multi-arch emulation
     matrix:
         - name: &name "Build ${TARGET_NAME} container"
           env:
@@ -102,7 +103,9 @@ container_images_task: &container_images
         # For $REGPFX namespace, select FQINs only.
         REG_USERNAME: ENCRYPTED[df4efe530b9a6a731cfea19233e395a5206d24dfac25e84329de035393d191e94ead8c39b373a0391fa025cab15470f8]
         REG_PASSWORD: ENCRYPTED[255ec05057707c20237a6c7d15b213422779c534f74fe019b8ca565f635dba0e11035a034e533a6f39e146e7435d87b5]
-    script: ci/make_container_images.sh;
+    script: |
+        podman run --rm --privileged mirror.gcr.io/multiarch/qemu-user-static:latest --reset -p yes
+        ci/make_container_images.sh
     package_cache: &package_cache
         folder: "/var/tmp/automation_images_tmp/.cache/**"
         fingerprint_key: "${TARGET_NAME}-cache-version-1"
@@ -117,8 +120,13 @@ imgts_build_task:
     skip: &ci_docs $CIRRUS_CHANGE_TITLE =~ '.*CI:DOCS.*'
     depends_on:
         - image_builder
-    timeout_in: *cntr_timeout
-    gce_instance: *ibi_vm
+    timeout_in: &cntr_timeout 40m
+    gce_instance: &ibi_vm
+        image_project: "libpod-218412"
+        # Trust whatever was built most recently is functional
+        image_family: "image-builder"
+        zone: "us-central1-a"
+        disk: 200  # Must be 200, negatively affects performance otherwise.
     env: *image_env
     script: |
         export TARGET_NAME=imgts
@@ -159,7 +167,6 @@ base_images_task:
     only_if: *is_pr
     skip: *ci_docs_tooling
     depends_on:
-        - container_images
         - image_builder
     # Packer needs time to clean up partially created VM images
     auto_cancellation: $CI != "true"
@@ -294,7 +301,7 @@ test_debug_task:
     skip: *ci_docs
     depends_on:
         - validate
-    gce_instance: *ibi_vm
+    gce_instance: *nested_virt_vm
     matrix:
         - env:
             TARGET: ci_debug

IMG_SFX

@@ -1 +1 @@
-20240819t164934z-f40f39d13
+20240820t193001z-f40f39d13

Makefile

@@ -117,6 +117,9 @@ GIT_HEAD = $(shell git rev-parse HEAD)
 # Save some typing
 _IMGTS_FQIN := quay.io/libpod/imgts:c$(_IMG_SFX)
 
+# Necessary for embedding a ',' in an $(if ...) conditional
+COMMA = ,
+
 ##### Targets #####
 
 # N/B: The double-# after targets is gawk'd out as the target description
@@ -308,9 +311,16 @@ fedora_podman:  ## Build Fedora podman development container
 prior-fedora_podman:  ## Build Prior-Fedora podman development container
 	$(call build_podman_container,$@,$(PRIOR_FEDORA_RELEASE))
 
+# Build multi-arch manifest list for the fedora_podman target only (not prior-fedora_podman).
+# N/B: This assumes that qemu_user_static is present and installed into the kernel or (as root)
+# podman run --rm --privileged mirror.gcr.io/multiarch/qemu-user-static:latest --reset -p yes
+# must been executed (e.g. on CentOS).
 $(_TEMPDIR)/%_podman.iid: podman/Containerfile podman/setup.sh $(wildcard base_images/*.sh) $(_TEMPDIR) $(wildcard cache_images/*.sh)
-	podman build -t $*_podman:$(call err_if_empty,_IMG_SFX) \
+	podman build --manifest=$*_podman:$(call err_if_empty,_IMG_SFX) \
+		--security-opt label=disable \
 		--security-opt seccomp=unconfined \
+		--platform=linux/amd64$(if $(subst prior-fedora,,$*),$(COMMA)linux/arm64) \
+		--jobs=2 \
 		--iidfile=$@ \
 		--build-arg=BASE_NAME=$(subst prior-,,$*) \
 		--build-arg=BASE_TAG=$(call err_if_empty,BASE_TAG) \