Merge pull request #3192 from cevich/add_zip

Cirrus: Add zip package to images

.cirrus.yml

@@ -31,9 +31,9 @@ env:
     ####
     #### Cache-image names to test with
     ###
-    FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5170730531028992"
-    PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-5170730531028992"
-    UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5170730531028992"
+    FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5171433328607232"
+    PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-5171433328607232"
+    UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5171433328607232"
 
     ####
     #### Variables for composing new cache-images (used in PR testing) from

contrib/cirrus/packer/fedora_setup.sh

@@ -66,7 +66,8 @@ ooe.sh sudo dnf install -y \
     unzip \
     vim \
     which \
-    xz
+    xz \
+    zip
 
 install_varlink
 

contrib/cirrus/packer/ubuntu_setup.sh

@@ -86,7 +86,8 @@ ooe.sh sudo -E apt-get -qq install \
     socat \
     unzip \
     vim \
-    xz-utils
+    xz-utils \
+    zip
 
 echo "Fixing Ubuntu kernel not enabling swap accounting by default"
 SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/g'

contrib/gate/Dockerfile

@@ -31,11 +31,12 @@ RUN dnf -y install \
       python3-pytoml \
       python3-pyyaml \
       python3-varlink \
-      containers-common \
-      slirp4netns \
       rsync \
+      slirp4netns \
+      unzip \
       which \
       xz \
+      zip \
       && dnf clean all
 
 ENV GOPATH="/go" \