From 404d5edb1557e3d2cb255d38bd89274586c4c100 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 2 Jun 2021 21:32:55 +0200 Subject: .cirrus.yml: use c5521575421149184 for Ubuntu Signed-off-by: Giuseppe Scrivano --- .cirrus.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1eb516d84..a403889c6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -30,17 +30,20 @@ env: PRIOR_UBUNTU_NAME: "ubuntu-2010" # Google-cloud VM Images + # TODO: At the time of this comment, an selinux-policy regression is blocking use of updated + # Fedora VM images: https://bugzilla.redhat.com/show_bug.cgi?id=1965743 + IMAGE_SUFFIX_UBUNTU: "c5521575421149184" IMAGE_SUFFIX: "c5348179051806720" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" - UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" - PRIOR_UBUNTU_CACHE_IMAGE_NAME: "prior-ubuntu-${IMAGE_SUFFIX}" + UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX_UBUNTU}" + PRIOR_UBUNTU_CACHE_IMAGE_NAME: "prior-ubuntu-${IMAGE_SUFFIX_UBUNTU}" # Container FQIN's FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" PRIOR_FEDORA_CONTAINER_FQIN: "quay.io/libpod/prior-fedora_podman:${IMAGE_SUFFIX}" - UBUNTU_CONTAINER_FQIN: "quay.io/libpod/ubuntu_podman:${IMAGE_SUFFIX}" - PRIOR_UBUNTU_CONTAINER_FQIN: "quay.io/libpod/prior-ubuntu_podman:${IMAGE_SUFFIX}" + UBUNTU_CONTAINER_FQIN: "quay.io/libpod/ubuntu_podman:${IMAGE_SUFFIX_UBUNTU}" + PRIOR_UBUNTU_CONTAINER_FQIN: "quay.io/libpod/prior-ubuntu_podman:${IMAGE_SUFFIX_UBUNTU}" #### #### Control variables that determine what to run and how to run it. -- cgit v1.2.3-54-g00ecf