DO NOT MERGE: Rely on podman-sequoia being present in the CI image

Relies on UNMERGED containers/automation_images#411 .

Signed-off-by: Miloslav Trmač <[email protected]>

Author: mtrmac

.cirrus.yml

@@ -21,8 +21,14 @@ env:
     SCRIPT_BASE: "./contrib/cirrus"
 
     # Google-cloud VM Images
-    IMAGE_SUFFIX: "c20250721t181111z-f42f41d13"
+    # If you are updating IMAGE_SUFFIX: We are currently using rawhide for
+    # the containers_image_sequoia tests because the rust-podman-sequoia
+    # 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: "c20250730t185529z-f42f41d13"
     FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
+    RAWHIDE_CACHE_IMAGE_NAME: "rawhide-${IMAGE_SUFFIX}"
 
     # Container FQIN's
     FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}"
@@ -190,17 +196,21 @@ test_skopeo_task:
         # Required to be 200gig, do not modify - has i/o performance impact
         # according to gcloud CLI tool warning messages.
         disk: 200
-        image_name: ${FEDORA_CACHE_IMAGE_NAME}
+        image_name: ${VM_IMAGE_NAME}
     matrix:
         - name: "Skopeo Test"  # N/B: Name ref. by hack/get_fqin.sh
           env:
               BUILDTAGS: ''
+              VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
         - name: "Skopeo Test w/ opengpg"
           env:
               BUILDTAGS: *withopengpg
-        - name: "Skopeo test w/ Sequoia"
+              VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
+        - name: "Skopeo test w/ Sequoia (currently Rawhide)"
           env:
               BUILDTAGS: 'containers_image_sequoia'
+              # If you are removing the use of rawhide, also remove the VM_IMAGE_NAME condition from runner.sh .
+              VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME}
     setup_script: >-
         "${GOSRC}/${SCRIPT_BASE}/runner.sh" setup
     vendor_script: >-

contrib/cirrus/runner.sh

@@ -6,8 +6,6 @@
 
 set -e
 
-PODMAN_SEQUOIA_COMMIT=7dda4eaf22db19c487a6fbc01fa35838c888e0ab # FIXME: drop
-
 # BEGIN Global export of all variables
 set -a
 
@@ -73,8 +71,10 @@ _run_setup() {
     # automation, but the sources are in different directories.  It's
     # possible for a mismatch to happen, but should (hopefully) be unlikely.
     # Double-check to make sure.
+    # Temporarily, allow running on Rawhide VMs and consuming older binaries:
+    # that should be compatible enough. Eventually, we’ll stop using Rawhide again.
     if ! grep -Fqx "ID=$OS_RELEASE_ID" $mnt/etc/os-release || \
-       ! grep -Fqx "VERSION_ID=$OS_RELEASE_VER" $mnt/etc/os-release; then
+       { ! [[ "$VM_IMAGE_NAME" =~ "rawhide" ]] && ! grep -Fqx "VERSION_ID=$OS_RELEASE_VER" $mnt/etc/os-release; } then
             die "Somehow $SKOPEO_CIDEV_CONTAINER_FQIN is not based on $OS_REL_VER."
     fi
     msg "Copying test binaries from $SKOPEO_CIDEV_CONTAINER_FQIN /usr/local/bin/"
@@ -98,20 +98,8 @@ _run_vendor() {
 }
 
 _run_build() {
-    if [[ "$BUILDTAGS" =~ containers_image_sequoia ]]; then
-        # FIXME: All of this should be removed after libpodman_sequoia is packaged; instead, install the RPM at image build time.
-        dnf install -y rustc cargo clang-devel capnproto
-        msg "Checking out libpodman_sequoia"
-        git clone https://github.com/ueno/podman-sequoia
-        (cd podman-sequoia && git checkout $PODMAN_SEQUOIA_COMMIT)
-        msg "Building libpodman_sequoia"
-        (cd podman-sequoia; cargo build --release)
-        msg "Built $(pwd)/podman-sequoia/target/release:"
-        ls -la $(pwd)/podman-sequoia/target/release
-    fi
-
-    make bin/skopeo BUILDTAGS="$BUILDTAGS" SEQUOIA_SONAME_DIR=$(pwd)/podman-sequoia/target/release
-    make install PREFIX=/usr/local BUILDTAGS="$BUILDTAGS" SEQUOIA_SONAME_DIR=$(pwd)/podman-sequoia/target/release
+    make bin/skopeo BUILDTAGS="$BUILDTAGS"
+    make install PREFIX=/usr/local BUILDTAGS="$BUILDTAGS"
 }
 
 _run_cross() {
@@ -123,7 +111,7 @@ _run_doccheck() {
 }
 
 _run_unit() {
-    make test-unit-local BUILDTAGS="$BUILDTAGS" SEQUOIA_SONAME_DIR=$(pwd)/podman-sequoia/target/release
+    make test-unit-local BUILDTAGS="$BUILDTAGS"
 }
 
 _podman_reset() {
@@ -133,13 +121,13 @@ _podman_reset() {
 
 _run_integration() {
     _podman_reset
-    make test-integration-local BUILDTAGS="$BUILDTAGS" SEQUOIA_SONAME_DIR=$(pwd)/podman-sequoia/target/release
+    make test-integration-local BUILDTAGS="$BUILDTAGS"
 }
 
 _run_system() {
     _podman_reset
     ##### Note: Test MODIFIES THE HOST SETUP #####
-    make test-system-local BUILDTAGS="$BUILDTAGS" SEQUOIA_SONAME_DIR=$(pwd)/podman-sequoia/target/release
+    make test-system-local BUILDTAGS="$BUILDTAGS"
 }
 
 req_env_vars SKOPEO_PATH