summaryrefslogtreecommitdiff
path: root/contrib/cirrus/packer/fedora_setup.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-03-13 15:13:17 -0400
committerChris Evich <cevich@redhat.com>2019-05-21 08:44:01 -0400
commit51a95e6ef1b4616f308d0a7a5507c2ece74a9f0f (patch)
treefc90cfd09731d180663cb47c38cf09de402d96ac /contrib/cirrus/packer/fedora_setup.sh
parent191a08ae43fcb2b846e6118073f852e4eb875d5d (diff)
downloadpodman-51a95e6ef1b4616f308d0a7a5507c2ece74a9f0f.tar.gz
podman-51a95e6ef1b4616f308d0a7a5507c2ece74a9f0f.tar.bz2
podman-51a95e6ef1b4616f308d0a7a5507c2ece74a9f0f.zip
Cirrus: Run tests on test-built cache-images
Also, add jq and catatonit installs to images. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/packer/fedora_setup.sh')
-rw-r--r--contrib/cirrus/packer/fedora_setup.sh7
1 files changed, 4 insertions, 3 deletions
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