Cirrus: Remove "too new" runc hack

Hack was to workaround not having fix for:
https://bodhi.fedoraproject.org/updates/FEDORA-2019-b4356521ba

Update `RUNC_COMMIT` value to match commit id to working package.

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

1 files changed, 10 insertions, 19 deletions

diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 4dbd56ed9..1a89a5b71 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -46,26 +46,17 @@ then
         X=$(echo "$envstr" | tee -a "$HOME/$ENVLIB") && eval "$X" && echo "$X"
     done
 
-    # Some setup needs to vary between distros
+    # Some environment setup needs to vary between distros
+    # Note: This should only be used for environment variables, and minor details.
+    #       Anything that could vary from one run to the next, should go into
+    #       contrib/cirrus/packer/*_setup.sh and be incorporated into VM cache-images
+    #       (see docs)
     case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in
-        ubuntu-18)
-            # Always install runc on Ubuntu
-            install_runc_from_git
-            ;;
-        fedora-29)
-            CON_SEL="https://kojipkgs.fedoraproject.org/packages/container-selinux/2.100/1.git3b78187.fc29/noarch/container-selinux-2.100-1.git3b78187.fc29.noarch.rpm"
-            echo ">>>>> OVERRIDING container-selinux WITH $CON_SEL <<<<<"
-            dnf -y install $CON_SEL
-            echo ">>>>> OVERRIDING criu and selinux-policy with latest package <<<<<"
-            dnf -y upgrade criu selinux-policy
-            ;&  # Continue to the next item
-        fedora-28)
-            echo ">>>>> OVERRIDING source-built runc with latest package <<<<<"
-            dnf update -y runc
-            ;&  # Continue to the next item
-        centos-7) ;&
-        rhel-7)
-            ;;
+        ubuntu-18) ;;
+        fedora-29) ;;
+        fedora-28) ;;
+        centos-7) ;;
+        rhel-7) ;;
         *) bad_os_id_ver ;;
     esac