WIP DO NOT MERGE: Build against a Rawhide RPM

- Set VM_IMAGE_NAME on the currently-deleted tests as well

DO NOT MERGE: Depends on UNMERGED containers/automation_images#411 .

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

Author: mtrmac

.cirrus.yml

@@ -30,8 +30,14 @@ env:
     SKOPEO_PR: 2645
 
     # 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 (include bleeding-edge development-level container deps.)
     FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}"
@@ -55,9 +61,12 @@ validate_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}
+        # Eventually, hard-code FEDORA_CACHE_IMAGE_NAME here again and remove the
+        # VM_IMAGE_NAME parameter.
+        image_name: ${VM_IMAGE_NAME}
     env:
         HOME: "/root"  # default unset, needed by golangci-lint.
+        VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
     script: |
         git remote update
         make tools
@@ -68,6 +77,8 @@ validate_task:
 cross_task:
     only_if: $CIRRUS_PR != $CIRRUS_PR
     gce_instance: *fedora_vm
+    env:
+        VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
     script: make cross
 
 
@@ -78,9 +89,10 @@ test_task:
     only_if: &not_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
     gce_instance: *fedora_vm
     matrix:
-        - name: "Test w/ Sequoia"
+        - name: "Test w/ Sequoia (currently Rawhide)"
           env:
               BUILDTAGS: &withsequoia 'containers_image_sequoia'
+              VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME}
     script: ${GOSRC}/${SCRIPT_BASE}/runner.sh image_tests
 
 
@@ -96,9 +108,10 @@ test_skopeo_task:
         - validate
     gce_instance: *fedora_vm
     matrix:
-        - name: "Skopeo Test w/ Sequoia"
+        - name: "Skopeo Test w/ Sequoia (currently Rawhide)"
           env:
               BUILDTAGS: *withsequoia
+              VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME}
     setup_script: >-
         "${GOSRC}/${SCRIPT_BASE}/runner.sh" setup
     vendor_script: >-
@@ -127,6 +140,7 @@ meta_task:
         # Space-separated list of images used by this repository state
         IMGNAMES: |
             ${FEDORA_CACHE_IMAGE_NAME}
+            ${RAWHIDE_CACHE_IMAGE_NAME}
         BUILDID: "${CIRRUS_BUILD_ID}"
         REPOREF: "${CIRRUS_REPO_NAME}"
         GCPJSON: ENCRYPTED[04306103eee1933f87deb8a5af6514a7e3164aa589d6079abc0451eb2360879430ed020d6e025ca64ef667138ce9d786]

contrib/cirrus/runner.sh

@@ -6,8 +6,6 @@
 
 set -e
 
-PODMAN_SEQUOIA_COMMIT=7dda4eaf22db19c487a6fbc01fa35838c888e0ab # FIXME: drop
-
 if [[ -r "/etc/automation_environment" ]]; then
     source /etc/automation_environment
     source $AUTOMATION_LIB_PATH/common_lib.sh
@@ -97,24 +95,13 @@ _run_image_tests() {
     msg "Setup known_hosts for root"
     ssh-keyscan localhost > /root/.ssh/known_hosts \
 
-    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
-        git clone https://github.com/ueno/podman-sequoia
-        (cd podman-sequoia && git checkout $PODMAN_SEQUOIA_COMMIT)
-        chown -R $ROOTLESS_USER:$ROOTLESS_USER podman-sequoia
-        msg "Building libpodman_sequoia"
-        showrun ssh $ROOTLESS_USER@localhost "cd $GOSRC/podman-sequoia; cargo build --release"
-    fi
-
     msg "Start rekor server as $ROOTLESS_USER"
     showrun ssh $ROOTLESS_USER@localhost $GOSRC/signature/sigstore/rekor/testdata/start-rekor.sh ci
     # remove rekor server on function exit
     trap "ssh $ROOTLESS_USER@localhost $GOSRC/signature/sigstore/rekor/testdata/start-rekor.sh ci remove" RETURN
 
     msg "Executing tests as $ROOTLESS_USER"
-    showrun ssh $ROOTLESS_USER@localhost make -C $GOSRC test "BUILDTAGS='$BUILDTAGS'" "TESTFLAGS=-v" "REKOR_SERVER_URL='http://127.0.0.1:3000'" \
-        SEQUOIA_SONAME_DIR="$GOSRC/podman-sequoia/target/release"
+    showrun ssh $ROOTLESS_USER@localhost make -C $GOSRC test "BUILDTAGS='$BUILDTAGS'" "TESTFLAGS=-v" "REKOR_SERVER_URL='http://127.0.0.1:3000'"
 }
 
 req_env_vars GOSRC