diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-24 11:42:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 11:42:18 +0200 |
| commit | 1ac06d8469295c24a2a629b8926bcd66805c6054 (patch) | |
| tree | d81798ad8405aea3c432bfe1c7c0d756ad3bf205 | |
| parent | 5296428e91a56ba47705849512e287302d572cfd (diff) | |
| parent | 52c86775be88d7b2901170410d915c5646fe2843 (diff) | |
| download | podman-1ac06d8469295c24a2a629b8926bcd66805c6054.tar.gz podman-1ac06d8469295c24a2a629b8926bcd66805c6054.tar.bz2 podman-1ac06d8469295c24a2a629b8926bcd66805c6054.zip | |
Merge pull request #3192 from cevich/add_zip
Cirrus: Add zip package to images
| -rw-r--r-- | .cirrus.yml | 6 | ||||
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 3 | ||||
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 3 | ||||
| -rw-r--r-- | contrib/gate/Dockerfile | 5 |
4 files changed, 10 insertions, 7 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index f3a0776db..e36b4f484 100644 --- a/.cirrus.yml +++ b/.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 diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index e031129d7..33e240895 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -66,7 +66,8 @@ ooe.sh sudo dnf install -y \ unzip \ vim \ which \ - xz + xz \ + zip install_varlink diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index 56d7f962e..17e274d97 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/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' diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile index e44c2fd4f..9a6f5dc8d 100644 --- a/contrib/gate/Dockerfile +++ b/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" \ |