opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-17 15:08:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Update VM Cache images

Browse Source 
Undo short-term slirp4netns workaround (#2660)

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2019-03-18 10:59:10 -04:00
parent 97fb495718
commit 51f223ec1c
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.cirrus.yml
View File

@ -28,15 +28,15 @@ env:
#### Cache-image names to test with
###
ACTIVE_CACHE_IMAGE_NAMES: >-
fedora-29-libpod-d6d53e40
fedora-28-libpod-d6d53e40
ubuntu-18-libpod-d6d53e40
rhel-7-libpod-7f4cd1f7
fedora-28-libpod-6318419153518592
fedora-29-libpod-6318419153518592
ubuntu-18-libpod-6318419153518592
rhel-7-libpod-6318419153518592
image-builder-image-1541772081
FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-d6d53e40"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-d6d53e40"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-d6d53e40"
PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-7f4cd1f7"
FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-6318419153518592"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-6318419153518592"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-6318419153518592"
PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-6318419153518592"
# RHEL_CACHE_IMAGE_NAME: "rhel-8-notready"
# CENTOS_CACHE_IMAGE_NAME: "centos-7-notready"

1
contrib/cirrus/setup_environment.sh
View File

@ -66,7 +66,6 @@ then
RUNC="https://kojipkgs.fedoraproject.org/packages/runc/1.0.0/55.dev.git578fe65.fc${OS_RELEASE_VER}/x86_64/runc-1.0.0-55.dev.git578fe65.fc${OS_RELEASE_VER}.x86_64.rpm"
echo ">>>>> OVERRIDING RUNC WITH $RUNC <<<<<"
dnf -y install "$RUNC"
dnf -y upgrade slirp4netns
;& # Continue to the next item
centos-7) ;&
rhel-7)