From 51f223ec1c40d157cb36db064531a6a22c3e26da Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 18 Mar 2019 10:59:10 -0400
Subject: Cirrus: Update VM Cache images
Undo short-term slirp4netns workaround (#2660)
Signed-off-by: Chris Evich <cevich@redhat.com>
---
.cirrus.yml | 16 ++++++++--------
contrib/cirrus/setup_environment.sh | 1 -
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 14ba3fc6e..ec0fe4f7a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -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"
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index ead2f7343..d8d97904b 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -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)
--
cgit v1.2.3-54-g00ecf