From 9e7ad87b1131c1a621143d71ee422db6041f7512 Mon Sep 17 00:00:00 2001 From: Chris Evich <cevich@redhat.com> Date: Thu, 17 Sep 2020 06:55:56 -0400 Subject: [PATCH] Cirrus: Use images from automation_images Previously, VM Images were built from a side-band process tacked onto containers/podman automation. This has recently been split off into it's own repository containers/automation_images. This PR makes use of freshly built images produced using the new workflow. Additionally, to support testing of a runc -> crun transition, both packages are installed in the newly referenced images. Signed-off-by: Chris Evich <cevich@redhat.com> --- .cirrus.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index effed4c..73b5c04 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,12 +11,12 @@ env: HOME: "/root" # not set by default GOCACHE: "${HOME}/.cache/go-build" - # VM Images are maintained in the libpod repo. - _BUILT_IMAGE_SUFFIX: "libpod-6508632441356288" - FEDORA_CACHE_IMAGE_NAME: "fedora-31-${_BUILT_IMAGE_SUFFIX}" - PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-30-${_BUILT_IMAGE_SUFFIX}" - UBUNTU_CACHE_IMAGE_NAME: "ubuntu-20-${_BUILT_IMAGE_SUFFIX}" - PRIOR_UBUNTU_CACHE_IMAGE_NAME: "ubuntu-19-${_BUILT_IMAGE_SUFFIX}" + # VM Images are maintained in the automation_images repo. + _BUILT_IMAGE_SUFFIX: "c6110627968057344" + FEDORA_CACHE_IMAGE_NAME: "fedora-${_BUILT_IMAGE_SUFFIX}" + PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${_BUILT_IMAGE_SUFFIX}" + UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${_BUILT_IMAGE_SUFFIX}" + PRIOR_UBUNTU_CACHE_IMAGE_NAME: "prior-ubuntu-${_BUILT_IMAGE_SUFFIX}" # Must be defined true when testing w/in containers CONTAINER: "false" -- GitLab