diff --git a/.cirrus.yml b/.cirrus.yml index 5debb3203..66b950241 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,12 +32,14 @@ env: IMAGE_PROJECT: "libpod-218412" FEDORA_NAME: "fedora-42" PRIOR_FEDORA_NAME: "fedora-41" + RAWHIDE_NAME: "rawhide" DEBIAN_NAME: "debian-13" # Image identifiers IMAGE_SUFFIX: "c20250910t092246z-f42f41d13" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" + RAWHIDE_CACHE_IMAGE_NAME: "rawhide-${IMAGE_SUFFIX}" # Used temporarily for rust-podman-sequoia. After that RPM is available in stable Fedora releases, we can stop testing against Rawhide again. DEBIAN_CACHE_IMAGE_NAME: "debian-${IMAGE_SUFFIX}" IN_PODMAN_IMAGE: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" @@ -79,6 +81,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} BUILDID: "${CIRRUS_BUILD_ID}" @@ -238,6 +241,11 @@ integration_task: DISTRO_NV: "${DEBIAN_NAME}" IMAGE_NAME: "${DEBIAN_CACHE_IMAGE_NAME}" STORAGE_DRIVER: 'overlay' + - env: + DISTRO_NV: "${RAWHIDE_NAME}" + IMAGE_NAME: "${RAWHIDE_CACHE_IMAGE_NAME}" + STORAGE_DRIVER: 'overlay' + TEST_BUILD_TAGS: 'containers_image_sequoia' gce_instance: &integration_gce_instance image_name: "$IMAGE_NAME" diff --git a/Makefile b/Makefile index 653331729..42a25d017 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ ifeq ($(shell uname -s),FreeBSD) # FreeBSD needs CNI until netavark is supported TAGS += cni endif -BUILDTAGS += $(TAGS) +BUILDTAGS += $(TAGS) $(EXTRA_BUILD_TAGS) PREFIX := /usr/local BINDIR := $(PREFIX)/bin BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions diff --git a/contrib/cirrus/build.sh b/contrib/cirrus/build.sh index b478a1303..5a809eeb1 100755 --- a/contrib/cirrus/build.sh +++ b/contrib/cirrus/build.sh @@ -16,7 +16,7 @@ then in_podman --rm $IN_PODMAN_NAME $0 else echo "Compiling buildah (\$GOSRC=$GOSRC)" - showrun make clean all + showrun make clean all EXTRA_BUILD_TAGS="$TEST_BUILD_TAGS" echo "Installing buildah" mkdir -p bin