Cirrus: fixups based on review feedback

Also remove disused distros (RHEL/CentOS/FAH) and fix get_ci_vm script

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

1 files changed, 0 insertions, 96 deletions

diff --git a/contrib/cirrus/packer/rhel_setup.sh b/contrib/cirrus/packer/rhel_setup.sh
deleted file mode 100644
index 577c8721a..000000000
--- a/contrib/cirrus/packer/rhel_setup.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-# This script is called by packer on the subject CentOS VM, to setup the podman
-# build/test environment.  It's not intended to be used outside of this context.
-
-set -e
-
-# Load in library (copied by packer, before this script was run)
-source /tmp/libpod/$SCRIPT_BASE/lib.sh
-
-req_env_var SCRIPT_BASE CNI_COMMIT CRIO_COMMIT CRIU_COMMIT RHSM_COMMAND RUNC_COMMIT
-
-install_ooe
-
-rhsm_enable
-
-ooe.sh sudo yum -y erase "rh-amazon-rhui-client*"
-ooe.sh sudo subscription-manager repos "--disable=*"
-ooe.sh sudo subscription-manager repos \
-    --enable=rhel-7-server-rpms \
-    --enable=rhel-7-server-optional-rpms \
-    --enable=rhel-7-server-extras-rpms \
-    --enable=rhel-server-rhscl-7-rpms
-
-sudo sed -r -i -e 's/^notify_only=.+/notify_only=0/g' \
-    /etc/yum/pluginconf.d/search-disabled-repos.conf
-
-ooe.sh sudo yum -y update
-
-ooe.sh sudo yum -y install \
-    PyYAML \
-    atomic-registries \
-    bats \
-    btrfs-progs-devel \
-    bzip2 \
-    device-mapper-devel \
-    emacs-nox \
-    findutils \
-    glib2-devel \
-    glibc-static \
-    gnupg \
-    golang \
-    golang-github-cpuguy83-go-md2man \
-    golang-github-cpuguy83-go-md2man \
-    gpgme-devel \
-    iptables \
-    jq \
-    libassuan-devel \
-    libcap-devel \
-    libnet \
-    libnet-devel \
-    libnl3-devel \
-    libseccomp-devel \
-    libselinux-devel \
-    lsof \
-    make \
-    nmap-ncat \
-    ostree-devel \
-    protobuf \
-    protobuf-c \
-    protobuf-c-devel \
-    protobuf-compiler \
-    protobuf-devel \
-    protobuf-python \
-    python \
-    python2-future \
-    python2-pyyaml \
-    python34-dateutil \
-    python34-psutil \
-    python34-pytoml \
-    python34-PyYAML \
-    skopeo-containers \
-    unzip \
-    vim \
-    which \
-    xz
-
-install_scl_git
-
-install_conmon
-
-install_runc
-
-install_criu
-
-install_cni_plugins
-
-install_buildah
-
-sudo /tmp/libpod/hack/install_catatonit.sh
-
-rhel_exit_handler  # release subscription!
-
-rh_finalize
-
-echo "SUCCESS!"