Cirrus: Run tests on test-built cache-images

Also, add jq and catatonit installs to images.

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

4 files changed, 21 insertions, 15 deletions

diff --git a/contrib/cirrus/packer/centos_setup.sh b/contrib/cirrus/packer/centos_setup.sh
index b86ba1a1c..f9728f2f7 100644
--- a/contrib/cirrus/packer/centos_setup.sh
+++ b/contrib/cirrus/packer/centos_setup.sh
@@ -59,7 +59,6 @@ ooe.sh sudo yum -y install \
     python3-dateutil \
     python3-psutil \
     python3-pytoml \
-    runc \
     skopeo-containers \
     unzip \
     vim \
@@ -68,14 +67,16 @@ ooe.sh sudo yum -y install \
 
 install_scl_git
 
-install_cni_plugins
-
-install_buildah
-
 install_conmon
 
+install_runc
+
 install_criu
 
+install_cni_plugins
+
+install_buildah
+
 install_packer_copied_files
 
 sudo /tmp/libpod/hack/install_catatonit.sh
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index fef74179d..d9229c668 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -60,7 +60,6 @@ ooe.sh sudo dnf install -y \
     python3-dateutil \
     python3-psutil \
     python3-pytoml \
-    runc \
     skopeo-containers \
     slirp4netns \
     unzip \
@@ -70,13 +69,15 @@ ooe.sh sudo dnf install -y \
 
 install_varlink
 
+install_conmon
+
+install_runc
+
 CNI_COMMIT=$FEDORA_CNI_COMMIT
 install_cni_plugins
 
 install_buildah
 
-install_conmon
-
 install_packer_copied_files
 
 sudo /tmp/libpod/hack/install_catatonit.sh
diff --git a/contrib/cirrus/packer/rhel_setup.sh b/contrib/cirrus/packer/rhel_setup.sh
index b6240be80..dee35a102 100644
--- a/contrib/cirrus/packer/rhel_setup.sh
+++ b/contrib/cirrus/packer/rhel_setup.sh
@@ -22,6 +22,9 @@ ooe.sh sudo subscription-manager repos \
     --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 \
@@ -66,7 +69,6 @@ ooe.sh sudo yum -y install \
     python34-psutil \
     python34-pytoml \
     python34-PyYAML \
-    runc \
     skopeo-containers \
     unzip \
     vim \
@@ -75,14 +77,16 @@ ooe.sh sudo yum -y install \
 
 install_scl_git
 
-install_cni_plugins
-
-install_buildah
-
 install_conmon
 
+install_runc
+
 install_criu
 
+install_cni_plugins
+
+install_buildah
+
 install_packer_copied_files
 
 sudo /tmp/libpod/hack/install_catatonit.sh
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 93dbd0fa0..d02b71e12 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -90,10 +90,10 @@ ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub.d/*
 ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub
 ooe.sh sudo update-grub
 
-install_runc
-
 install_conmon
 
+install_runc
+
 install_criu
 
 install_cni_plugins