From 5156ab996cf4cb9aea3cc67375d9d2b48eb5aeb5 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 20 Apr 2023 11:11:42 -0400 Subject: [PATCH] Cirrus: Enable testing on Fedora rawhide Signed-off-by: Chris Evich --- .cirrus.yml | 10 +++++++++- contrib/cirrus/setup_environment.sh | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index bde179a35a..79e785a889 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -29,16 +29,18 @@ env: FEDORA_NAME: "fedora-37" FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64" PRIOR_FEDORA_NAME: "fedora-36" + RAWHIDE_NAME: "rawhide" DEBIAN_NAME: "debian-12" # Image identifiers - IMAGE_SUFFIX: "c20230405t152256z-f37f36d12" + IMAGE_SUFFIX: "c20230420t184033z-f37f36d12" # EC2 images FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}" # GCP Images FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" + RAWHIDE_CACHE_IMAGE_NAME: "rawhide-${IMAGE_SUFFIX}" DEBIAN_CACHE_IMAGE_NAME: "debian-${IMAGE_SUFFIX}" # Container FQIN's FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" @@ -120,6 +122,11 @@ build_task: CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} CI_DESIRED_RUNTIME: crun CI_DESIRED_NETWORK: cni + - env: + <<: *sqliteenvvars + DISTRO_NV: ${RAWHIDE_NAME} + VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME} + CTR_FQIN: "" - env: &debian_envvars DISTRO_NV: ${DEBIAN_NAME} VM_IMAGE_NAME: ${DEBIAN_CACHE_IMAGE_NAME} @@ -988,6 +995,7 @@ meta_task: IMGNAMES: >- ${FEDORA_CACHE_IMAGE_NAME} ${PRIOR_FEDORA_CACHE_IMAGE_NAME} + ${RAWHIDE_CACHE_IMAGE_NAME} ${DEBIAN_CACHE_IMAGE_NAME} build-push-${IMAGE_SUFFIX} EC2IMGNAMES: >- diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 24fda605a9..b315cd58cd 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -63,6 +63,7 @@ echo -e "\n# Begin single-use VM global variables (${BASH_SOURCE[0]})" \ # shellcheck disable=SC2154 grep -q "$DISTRO_NV" <<<"$OS_REL_VER" || \ grep -q "$OS_REL_VER" <<<"$DISTRO_NV" || \ + grep -q "rawhide" <<<"$DISTRO_NV" || \ die "Automation spec. '$DISTRO_NV'; actual host '$OS_REL_VER'" # Only allow this script to execute once