Skip to content

Cirrus: Add zip package to images #3192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
May 24, 2019
Merged

Cirrus: Add zip package to images #3192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
361f787
Cirrus: Add zip package to images
cevich May 21, 2019
52c8677
cirrus: update images w/ zip pkg
cevich May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion contrib/cirrus/packer/fedora_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ ooe.sh sudo dnf install -y \
unzip \
vim \
which \
xz
xz \
zip

install_varlink

Expand Down
3 changes: 2 additions & 1 deletion contrib/cirrus/packer/ubuntu_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions contrib/gate/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down