opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-29 23:22:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Update to F37beta

Browse Source 
Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2022-09-15 11:35:50 -04:00
parent 0e367c7a18
commit ecd1927b4c
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.cirrus.yml
View File

@ -27,23 +27,23 @@ 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)
#### Comment out fedora-35 for podman 4.x branches. #### Comment out fedora-35 for podman 4.x branches.
#### ####
FEDORA_NAME: "fedora-36" FEDORA_NAME: "fedora-37"
FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64" FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64"
#PRIOR_FEDORA_NAME: "fedora-35" PRIOR_FEDORA_NAME: "fedora-36"
UBUNTU_NAME: "ubuntu-2204" UBUNTU_NAME: "ubuntu-2204"
# Image identifiers # Image identifiers
IMAGE_SUFFIX: "c4678746211876864" IMAGE_SUFFIX: "c5178639502278656"
# EC2 images # EC2 images
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}" FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}" FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}"
# GCP Images # GCP Images
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}"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
# Container FQIN's # Container FQIN's
FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}"
#PRIOR_FEDORA_CONTAINER_FQIN: "quay.io/libpod/prior-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}" UBUNTU_CONTAINER_FQIN: "quay.io/libpod/ubuntu_podman:${IMAGE_SUFFIX}"
WINDOWS_AMI: "win-server-wsl-c5138587457421312" # Replace with IMAGE_SUFFIX when aligned WINDOWS_AMI: "win-server-wsl-c5138587457421312" # Replace with IMAGE_SUFFIX when aligned
#### ####
@ -104,11 +104,11 @@ build_task:
CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
# ID for re-use of build output # ID for re-use of build output
CI_DESIRED_RUNTIME: crun CI_DESIRED_RUNTIME: crun
#- env: &priorfedora_envvars - env: &priorfedora_envvars
# DISTRO_NV: ${PRIOR_FEDORA_NAME} DISTRO_NV: ${PRIOR_FEDORA_NAME}
# VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
# CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
# CI_DESIRED_RUNTIME: crun CI_DESIRED_RUNTIME: crun
- env: &ubuntu_envvars - env: &ubuntu_envvars
DISTRO_NV: ${UBUNTU_NAME} DISTRO_NV: ${UBUNTU_NAME}
VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME}
@ -592,10 +592,11 @@ container_integration_test_task:
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
CI_DESIRED_RUNTIME: crun CI_DESIRED_RUNTIME: crun
#- env: - env:
# DISTRO_NV: ${PRIOR_FEDORA_NAME} DISTRO_NV: ${PRIOR_FEDORA_NAME}
# VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
# CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
CI_DESIRED_RUNTIME: crun
gce_instance: *standardvm gce_instance: *standardvm
timeout_in: 90m timeout_in: 90m
env: env:
@ -949,9 +950,9 @@ meta_task:
image: quay.io/libpod/imgts:latest image: quay.io/libpod/imgts:latest
env: env:
# Space-separated list of images used by this repository state # Space-separated list of images used by this repository state
# Disabled ${PRIOR_FEDORA_CACHE_IMAGE_NAME} for Fedora 35
IMGNAMES: >- IMGNAMES: >-
${FEDORA_CACHE_IMAGE_NAME} ${FEDORA_CACHE_IMAGE_NAME}
${PRIOR_FEDORA_CACHE_IMAGE_NAME}
${UBUNTU_CACHE_IMAGE_NAME} ${UBUNTU_CACHE_IMAGE_NAME}
build-push-${IMAGE_SUFFIX} build-push-${IMAGE_SUFFIX}
EC2IMGNAMES: >- EC2IMGNAMES: >-

1
contrib/cirrus/lib.sh
View File

@ -208,6 +208,7 @@ use_cni() {
export -n NETWORK_BACKEND export -n NETWORK_BACKEND
unset NETWORK_BACKEND unset NETWORK_BACKEND
msg "Installing default CNI configuration" msg "Installing default CNI configuration"
dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-plugins*
cd $GOSRC || exit 1 cd $GOSRC || exit 1
rm -rvf /etc/cni/net.d rm -rvf /etc/cni/net.d
mkdir -p /etc/cni/net.d mkdir -p /etc/cni/net.d

14
contrib/cirrus/setup_environment.sh
View File

@ -126,19 +126,19 @@ case "$OS_RELEASE_ID" in
setsebool container_manage_cgroup true setsebool container_manage_cgroup true
fi fi
# For release 36 and later, netavark/aardvark is the default # For the latest Fedora CI VM images, netavark/aardvark is the
# networking stack for podman. All previous releases only have # intended networking stack for podman. All previous VM images
# CNI networking available. Upgrading from one to the other is # should use CNI networking. Upgrading from one to the other is
# not supported at this time. Support execution of the upgrade # not supported at this time. The only exception in CI is
# tests in F36 and later, by disabling Netavark and enabling CNI. # the "upgrade tests" which must always use CNI.
# #
# OS_RELEASE_VER is defined by automation-library # OS_RELEASE_VER is defined by automation-library
# shellcheck disable=SC2154 # shellcheck disable=SC2154
if [[ "$OS_RELEASE_VER" -ge 36 ]] && \ if [[ "$DISTRO_NV" != "$PRIOR_FEDORA_NAME" ]] && \
[[ "$TEST_FLAVOR" != "upgrade_test" ]]; [[ "$TEST_FLAVOR" != "upgrade_test" ]];
then then
use_netavark use_netavark
else # Fedora < 36, or upgrade testing. else # Fedora N-1 or upgrade testing.
use_cni use_cni
fi fi
;; ;;