diff options
| author | Chris Evich <cevich@redhat.com> | 2019-03-18 10:59:10 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-03-18 11:25:38 -0400 |
| commit | 51f223ec1c40d157cb36db064531a6a22c3e26da (patch) | |
| tree | 42394ba1e0b41772c75c3eb084da84e3f7143d40 | |
| parent | 97fb49571828b9d206ff284ed18448f96ae877e9 (diff) | |
| download | podman-51f223ec1c40d157cb36db064531a6a22c3e26da.tar.gz podman-51f223ec1c40d157cb36db064531a6a22c3e26da.tar.bz2 podman-51f223ec1c40d157cb36db064531a6a22c3e26da.zip | |
Cirrus: Update VM Cache images
Undo short-term slirp4netns workaround (#2660)
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rw-r--r-- | .cirrus.yml | 16 | ||||
| -rwxr-xr-x | 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) |