Merge pull request #3607 from cevich/cgroup2_vm

Add another Fedora VM with cgroups v2 enabled

1 files changed, 58 insertions, 14 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index dfcd86a5d..84b483b57 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -28,11 +28,13 @@ env:
     TIMESTAMP: "awk --file ${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/timestamp.awk"
 
     ####
-    #### Cache-image names to test with
+    #### Cache-image names to test with (double-quotes around names are critical)
     ###
-    FEDORA_CACHE_IMAGE_NAME: "fedora-30-libpod-5789386598252544"
-    PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5789386598252544"
-    UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5789386598252544"
+    _BUILT_IMAGE_SUFFIX: "libpod-5751722641719296"
+    FEDORA_CACHE_IMAGE_NAME: "fedora-30-${_BUILT_IMAGE_SUFFIX}"
+    PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-29-${_BUILT_IMAGE_SUFFIX}"
+    SPECIAL_FEDORA_CACHE_IMAGE_NAME: "xfedora-30-${_BUILT_IMAGE_SUFFIX}"
+    UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-${_BUILT_IMAGE_SUFFIX}"
 
     ####
     #### Variables for composing new cache-images (used in PR testing) from
@@ -262,6 +264,7 @@ meta_task:
         IMGNAMES: >-
             ${FEDORA_CACHE_IMAGE_NAME}
             ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
+            ${SPECIAL_FEDORA_CACHE_IMAGE_NAME}
             ${UBUNTU_CACHE_IMAGE_NAME}
             ${IMAGE_BUILDER_CACHE_IMAGE_NAME}
         BUILDID: "${CIRRUS_BUILD_ID}"
@@ -404,7 +407,6 @@ special_testing_rootless_task:
     env:
         ADD_SECOND_PARTITION: true
         SPECIALMODE: 'rootless'  # See docs
-
         matrix:
             TEST_REMOTE_CLIENT: true
             TEST_REMOTE_CLIENT: false
@@ -472,6 +474,36 @@ special_testing_cross_task:
         failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
 
 
+special_testing_cgroupv2_task:
+
+    depends_on:
+        - "gating"
+        - "varlink_api"
+        - "vendor"
+
+    only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\*\*\*\s*CIRRUS:\s*TEST\s*IMAGES\s*\*\*\*.*'
+
+    gce_instance:
+        image_name: "${SPECIAL_FEDORA_CACHE_IMAGE_NAME}"
+
+    env:
+        SPECIALMODE: 'cgroupv2'  # See docs
+        matrix:
+            TEST_REMOTE_CLIENT: true
+            TEST_REMOTE_CLIENT: false
+
+    timeout_in: 20m
+
+    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
+    integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
+
+    on_failure:
+        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
+
+    always:
+        <<: *standardlogs
+
+
 # Test building of new cache-images for future PR testing, in this PR.
 test_build_cache_images_task:
 
@@ -521,25 +553,35 @@ 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: "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
+    check_image_script: >-
+        [[ "$TEST_REMOTE_CLIENT" == "false" ]] || \
+            $SCRIPT_BASE/check_image.sh |& ${TIMESTAMP}
     # Note: A truncated form of normal testing. It only needs to confirm new images
     # "probably" work.  A full round of testing will happen again after $*_CACHE_IMAGE_NAME
     # are updated in this or another PR (w/o '***CIRRUS: TEST IMAGES***').
-    environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
-    check_image_script: '$SCRIPT_BASE/check_image.sh'
-    integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
-    system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}'
+    integration_test_script: >-
+        [[ "$PACKER_BUILDER_NAME" == "xfedora-30" ]] || \
+            $SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}
+    system_test_script: >-
+        [[ "$PACKER_BUILDER_NAME" == "xfedora-30" ]] || \
+            $SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}
 
     always:
         <<: *standardlogs
@@ -564,6 +606,7 @@ success_task:
         - "testing_crun"
         - "special_testing_rootless"
         - "special_testing_in_podman"
+        - "special_testing_cgroupv2"
         - "special_testing_cross"
         - "test_build_cache_images"
         - "verify_test_built_images"
@@ -603,6 +646,7 @@ release_task:
         - "testing_crun"
         - "special_testing_rootless"
         - "special_testing_in_podman"
+        - "special_testing_cgroupv2"
         - "special_testing_cross"
         - "test_build_cache_images"
         - "verify_test_built_images"