Cirrus: Add latest ubuntu

Add the latest Ubuntu version into the testing matrix
and image-build workflow. This is also needed to support
other containers projects which share use of VM images
from this one.

Update package lists to include needs for contianers/storage
use of images.

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

1 files changed, 6 insertions, 7 deletions

diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index c1a01d6ab..df510deef 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -33,8 +33,8 @@ done
 #       contrib/cirrus/packer/*_setup.sh to be incorporated into VM cache-images
 #       (see docs).
 cd "${GOSRC}/"
-case "${OS_REL_VER}" in
-    ubuntu-18)
+case "${OS_RELEASE_ID}" in
+    ubuntu)
         CRIO_RUNC_PATH="/usr/lib/cri-o-runc/sbin/runc"
         if dpkg -L cri-o-runc | grep -m 1 -q "$CRIO_RUNC_PATH"
         then
@@ -42,14 +42,13 @@ case "${OS_REL_VER}" in
             ln -f "$CRIO_RUNC_PATH" "/usr/bin/runc"
         fi
         ;;
-    fedora-30) ;&  # continue to next item
-    fedora-29)
-	# All SELinux distros need this for systemd-in-a-container
-	setsebool container_manage_cgroup true
+    fedora)
+        # All SELinux distros need this for systemd-in-a-container
+        setsebool container_manage_cgroup true
         if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
             bash "$SCRIPT_BASE/add_second_partition.sh"; fi
         ;;
-    centos-7)  # Current VM is an image-builder-image no local podman/testing
+    centos)  # Current VM is an image-builder-image no local podman/testing
         echo "No further setup required for VM image building"
         exit 0
         ;;