Cirrus: Confirm CGv1 / CGv2 VM expectations

Signed-off-by: Chris Evich <[email protected]>
jvanz · Aug 18, 2021 · 9dd088e · 9dd088e
1 parent 5c837fe
commit 9dd088e
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
@@ -77,6 +77,13 @@ case "$CG_FS_TYPE" in
             else
                 echo "OCI_RUNTIME=runc" >> /etc/ci_environment
             fi
+
+            # As a general policy CGv1 + runc should coincide with the "older"
+            # VM Images in CI.  Verify this is the case.
+            if [[ -n "$VM_IMAGE_NAME" ]] && [[ ! "$VM_IMAGE_NAME" =~ prior ]]
+            then
+                die "Most recent distro. version should never run with CGv1"
+            fi
         fi
         ;;
     cgroup2fs)
@@ -85,6 +92,13 @@ case "$CG_FS_TYPE" in
             # which uses runc as the default.
             warn "Forcing testing with crun instead of runc"
             echo "OCI_RUNTIME=crun" >> /etc/ci_environment
+
+            # As a general policy CGv2 + crun should coincide with the "newer"
+            # VM Images in CI.  Verify this is the case.
+            if [[ -n "$VM_IMAGE_NAME" ]] && [[ "$VM_IMAGE_NAME" =~ prior ]]
+            then
+                die "Least recent distro. version should never run with CGv2"
+            fi
         fi
         ;;
     *) die_unknown CG_FS_TYPE