containers/buildah
1
0
Fork 0
mirror of https://github.com/containers/buildah.git synced 2026-02-05 09:45:38 +01:00
Code Issues Releases Wiki Activity

Also run integration tests with the Sequoia backend

Browse Source 
This extra test run is temporary; it should be removed after
rust-podman-sequoia makes it to a stable Fedora release.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2025-09-17 18:28:26 +02:00
parent c9c1d764cf
commit 3748cda03b
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.cirrus.yml
View File

@@ -32,12 +32,14 @@ env:
IMAGE_PROJECT: "libpod-218412" IMAGE_PROJECT: "libpod-218412"
FEDORA_NAME: "fedora-42" FEDORA_NAME: "fedora-42"
PRIOR_FEDORA_NAME: "fedora-41" PRIOR_FEDORA_NAME: "fedora-41"
RAWHIDE_NAME: "rawhide"
DEBIAN_NAME: "debian-13" DEBIAN_NAME: "debian-13"
# Image identifiers # Image identifiers
IMAGE_SUFFIX: "c20250910t092246z-f42f41d13" IMAGE_SUFFIX: "c20250910t092246z-f42f41d13"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-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}" DEBIAN_CACHE_IMAGE_NAME: "debian-${IMAGE_SUFFIX}"
IN_PODMAN_IMAGE: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" IN_PODMAN_IMAGE: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}"
@@ -79,6 +81,7 @@ meta_task:
IMGNAMES: |- IMGNAMES: |-
${FEDORA_CACHE_IMAGE_NAME} ${FEDORA_CACHE_IMAGE_NAME}
${PRIOR_FEDORA_CACHE_IMAGE_NAME} ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
${RAWHIDE_CACHE_IMAGE_NAME}
${DEBIAN_CACHE_IMAGE_NAME} ${DEBIAN_CACHE_IMAGE_NAME}
build-push-${IMAGE_SUFFIX} build-push-${IMAGE_SUFFIX}
BUILDID: "${CIRRUS_BUILD_ID}" BUILDID: "${CIRRUS_BUILD_ID}"
@@ -238,6 +241,11 @@ integration_task:
DISTRO_NV: "${DEBIAN_NAME}" DISTRO_NV: "${DEBIAN_NAME}"
IMAGE_NAME: "${DEBIAN_CACHE_IMAGE_NAME}" IMAGE_NAME: "${DEBIAN_CACHE_IMAGE_NAME}"
STORAGE_DRIVER: 'overlay' 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 gce_instance: &integration_gce_instance
image_name: "$IMAGE_NAME" image_name: "$IMAGE_NAME"

2
Makefile
View File

@@ -8,7 +8,7 @@ ifeq ($(shell uname -s),FreeBSD)
# FreeBSD needs CNI until netavark is supported # FreeBSD needs CNI until netavark is supported
TAGS += cni TAGS += cni
endif endif
BUILDTAGS += $(TAGS) BUILDTAGS += $(TAGS) $(EXTRA_BUILD_TAGS)
PREFIX := /usr/local PREFIX := /usr/local
BINDIR := $(PREFIX)/bin BINDIR := $(PREFIX)/bin
BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions

2
contrib/cirrus/build.sh
View File

@@ -16,7 +16,7 @@ then
in_podman --rm $IN_PODMAN_NAME $0 in_podman --rm $IN_PODMAN_NAME $0
else else
echo "Compiling buildah (\$GOSRC=$GOSRC)" echo "Compiling buildah (\$GOSRC=$GOSRC)"
showrun make clean all showrun make clean all EXTRA_BUILD_TAGS="$TEST_BUILD_TAGS"
echo "Installing buildah" echo "Installing buildah"
mkdir -p bin mkdir -p bin