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>
This commit is contained in:
parent
d4ea314056
commit
de59b1d076
11
.cirrus.yml
11
.cirrus.yml
|
|
@ -17,14 +17,15 @@ env:
|
||||||
####
|
####
|
||||||
#### Cache-image names to test with (double-quotes around names are critical)
|
#### Cache-image names to test with (double-quotes around names are critical)
|
||||||
###
|
###
|
||||||
FEDORA_NAME: "fedora-32"
|
FEDORA_NAME: "fedora"
|
||||||
PRIOR_FEDORA_NAME: "fedora-31"
|
PRIOR_FEDORA_NAME: "prior-fedora"
|
||||||
UBUNTU_NAME: "ubuntu-20"
|
UBUNTU_NAME: "ubuntu"
|
||||||
PRIOR_UBUNTU_NAME: "ubuntu-19"
|
PRIOR_UBUNTU_NAME: "prior-ubuntu"
|
||||||
|
|
||||||
# GCE project where images live
|
# GCE project where images live
|
||||||
IMAGE_PROJECT: "libpod-218412"
|
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}"
|
FEDORA_CACHE_IMAGE_NAME: "${FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}"
|
||||||
PRIOR_FEDORA_CACHE_IMAGE_NAME: "${PRIOR_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}"
|
UBUNTU_CACHE_IMAGE_NAME: "${UBUNTU_NAME}-${_BUILT_IMAGE_SUFFIX}"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue