Cirrus: Add verification for cgroupv2 image

Signed-off-by: Chris Evich <cevich@redhat.com>

.cirrus.yml

@@ -364,7 +364,6 @@ special_testing_rootless_task:
     env:
         ADD_SECOND_PARTITION: true
         SPECIALMODE: 'rootless'  # See docs
-
         matrix:
             TEST_REMOTE_CLIENT: true
             TEST_REMOTE_CLIENT: false
@@ -446,6 +445,9 @@ special_testing_cgroupv2_task:
 
     env:
         SPECIALMODE: 'cgroupv2'  # See docs
+        matrix:
+            TEST_REMOTE_CLIENT: true
+            TEST_REMOTE_CLIENT: false
 
     timeout_in: 20m
 
@@ -508,18 +510,20 @@ verify_test_built_images_task:
         - "test_build_cache_images"
 
     gce_instance:
-        matrix:
-            # Images are generated separately, from build_images_task (below)
-            image_name: "fedora-29${BUILT_IMAGE_SUFFIX}"
-            image_name: "fedora-30${BUILT_IMAGE_SUFFIX}"
-            image_name: "xfedora-30${BUILT_IMAGE_SUFFIX}"
-            image_name: "ubuntu-18${BUILT_IMAGE_SUFFIX}"
+        # Images generated by test_build_cache_images_task (above)
+        image_name: "${PACKER_BUILDER_NAME}${BUILT_IMAGE_SUFFIX}"
 
     env:
         ADD_SECOND_PARTITION: true
         matrix:
             TEST_REMOTE_CLIENT: true
             TEST_REMOTE_CLIENT: false
+        matrix:
+            # Required env. var. by check_image_script
+            PACKER_BUILDER_NAME: "fedora-29"
+            PACKER_BUILDER_NAME: "fedora-30"
+            PACKER_BUILDER_NAME: "xfedora-30"
+            PACKER_BUILDER_NAME: "ubuntu-18"
 
     environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
     # Verify expectations once per image
@@ -558,6 +562,7 @@ success_task:
         - "testing"
         - "special_testing_rootless"
         - "special_testing_in_podman"
+        - "special_testing_cgroupv2"
         - "special_testing_cross"
         - "test_build_cache_images"
         - "verify_test_built_images"
@@ -596,6 +601,7 @@ release_task:
         - "testing"
         - "special_testing_rootless"
         - "special_testing_in_podman"
+        - "special_testing_cgroupv2"
         - "special_testing_cross"
         - "test_build_cache_images"
         - "verify_test_built_images"

contrib/cirrus/check_image.sh

@@ -4,6 +4,8 @@ set -eo pipefail
 
 source $(dirname $0)/lib.sh
 
+req_env_var PACKER_BUILDER_NAME TEST_REMOTE_CLIENT EVIL_UNITS OS_RELEASE_ID
+
 NFAILS=0
 echo "Validating VM image"
 
@@ -49,5 +51,16 @@ then
     item_test "On ubuntu /usr/bin/runc is /usr/lib/cri-o-runc/sbin/runc" "$SAMESAME" -eq "0" || let "NFAILS+=1"
 fi
 
+echo "Checking items specific to ${PACKER_BUILDER_NAME}${BUILT_IMAGE_SUFFIX}"
+case "$PACKER_BUILDER_NAME" in
+    xfedora*)
+        echo "Kernel Command-line: $(cat /proc/cmdline)"
+        item_test \
+            "On ${PACKER_BUILDER_NAME} images, the /sys/fs/cgroup/unified directory does NOT exist" \
+            "!" "-d" "/sys/fs/cgroup/unified" || let "NFAILS+=1"
+        ;;
+    *) echo "No vm-image specific items to check"
+esac
+
 echo "Total failed tests: $NFAILS"
 exit $NFAILS