From de59b1d0768970a210b83aa2af8330dd19dc35cd Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 17 Sep 2020 07:01:52 -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 --- .cirrus.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 6ba46ebbb..8bfe821ce 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -17,14 +17,15 @@ env: #### #### Cache-image names to test with (double-quotes around names are critical) ### - FEDORA_NAME: "fedora-32" - PRIOR_FEDORA_NAME: "fedora-31" - UBUNTU_NAME: "ubuntu-20" - PRIOR_UBUNTU_NAME: "ubuntu-19" + FEDORA_NAME: "fedora" + PRIOR_FEDORA_NAME: "prior-fedora" + UBUNTU_NAME: "ubuntu" + PRIOR_UBUNTU_NAME: "prior-ubuntu" # GCE project where images live IMAGE_PROJECT: "libpod-218412" - _BUILT_IMAGE_SUFFIX: "libpod-6508632441356288" + # VM Image built in containers/automation_images + _BUILT_IMAGE_SUFFIX: "c6110627968057344" FEDORA_CACHE_IMAGE_NAME: "${FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "${PRIOR_FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "${UBUNTU_NAME}-${_BUILT_IMAGE_SUFFIX}"