From ecd1927b4c27c123a502f4fb1d655d45bfc13806 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 15 Sep 2022 11:35:50 -0400 Subject: [PATCH] Cirrus: Update to F37beta Signed-off-by: Chris Evich --- .cirrus.yml | 31 +++++++++++++++-------------- contrib/cirrus/lib.sh | 1 + contrib/cirrus/setup_environment.sh | 14 ++++++------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index be32c95fff..c732dd50ae 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -27,23 +27,23 @@ env: #### Cache-image names to test with (double-quotes around names are critical) #### Comment out fedora-35 for podman 4.x branches. #### - FEDORA_NAME: "fedora-36" + FEDORA_NAME: "fedora-37" FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64" - #PRIOR_FEDORA_NAME: "fedora-35" + PRIOR_FEDORA_NAME: "fedora-36" UBUNTU_NAME: "ubuntu-2204" # Image identifiers - IMAGE_SUFFIX: "c4678746211876864" + IMAGE_SUFFIX: "c5178639502278656" # 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}" + PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" # Container FQIN's 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}" WINDOWS_AMI: "win-server-wsl-c5138587457421312" # Replace with IMAGE_SUFFIX when aligned #### @@ -104,11 +104,11 @@ build_task: CTR_FQIN: ${FEDORA_CONTAINER_FQIN} # ID for re-use of build output CI_DESIRED_RUNTIME: crun - #- env: &priorfedora_envvars - # DISTRO_NV: ${PRIOR_FEDORA_NAME} - # VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} - # CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} - # CI_DESIRED_RUNTIME: crun + - env: &priorfedora_envvars + DISTRO_NV: ${PRIOR_FEDORA_NAME} + VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} + CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} + CI_DESIRED_RUNTIME: crun - env: &ubuntu_envvars DISTRO_NV: ${UBUNTU_NAME} VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME} @@ -592,10 +592,11 @@ container_integration_test_task: VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} CTR_FQIN: ${FEDORA_CONTAINER_FQIN} CI_DESIRED_RUNTIME: crun - #- env: - # DISTRO_NV: ${PRIOR_FEDORA_NAME} - # VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} - # CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} + - env: + DISTRO_NV: ${PRIOR_FEDORA_NAME} + VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME} + CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} + CI_DESIRED_RUNTIME: crun gce_instance: *standardvm timeout_in: 90m env: @@ -949,9 +950,9 @@ meta_task: image: quay.io/libpod/imgts:latest env: # Space-separated list of images used by this repository state - # Disabled ${PRIOR_FEDORA_CACHE_IMAGE_NAME} for Fedora 35 IMGNAMES: >- ${FEDORA_CACHE_IMAGE_NAME} + ${PRIOR_FEDORA_CACHE_IMAGE_NAME} ${UBUNTU_CACHE_IMAGE_NAME} build-push-${IMAGE_SUFFIX} EC2IMGNAMES: >- diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index b03a3da3ec..004c3446bb 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -208,6 +208,7 @@ use_cni() { export -n NETWORK_BACKEND unset NETWORK_BACKEND msg "Installing default CNI configuration" + dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-plugins* cd $GOSRC || exit 1 rm -rvf /etc/cni/net.d mkdir -p /etc/cni/net.d diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 9c01aec6fe..ccd5d41fe3 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -126,19 +126,19 @@ case "$OS_RELEASE_ID" in setsebool container_manage_cgroup true fi - # For release 36 and later, netavark/aardvark is the default - # networking stack for podman. All previous releases only have - # CNI networking available. Upgrading from one to the other is - # not supported at this time. Support execution of the upgrade - # tests in F36 and later, by disabling Netavark and enabling CNI. + # For the latest Fedora CI VM images, netavark/aardvark is the + # intended networking stack for podman. All previous VM images + # should use CNI networking. Upgrading from one to the other is + # not supported at this time. The only exception in CI is + # the "upgrade tests" which must always use CNI. # # OS_RELEASE_VER is defined by automation-library # shellcheck disable=SC2154 - if [[ "$OS_RELEASE_VER" -ge 36 ]] && \ + if [[ "$DISTRO_NV" != "$PRIOR_FEDORA_NAME" ]] && \ [[ "$TEST_FLAVOR" != "upgrade_test" ]]; then use_netavark - else # Fedora < 36, or upgrade testing. + else # Fedora N-1 or upgrade testing. use_cni fi ;;