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

Merge pull request #15760 from cevich/enable_kube_tests

Browse Source 
Cirrus: Update CI VM images to F37beta
This commit is contained in:
OpenShift Merge Robot
2022-11-02 17:04:30 -04:00
committed by GitHub
parent c35ed35081 8530724555
commit 774e950374
3 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
.cirrus.yml
View File

@ -27,24 +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}"
WINDOWS_AMI: "win-server-wsl-c5138587457421312" # Replace with IMAGE_SUFFIX when aligned WINDOWS_AMI: "win-server-wsl-c5138587457421312" # Replace with IMAGE_SUFFIX when aligned
#### ####
#### Control variables that determine what to run and how to run it. #### Control variables that determine what to run and how to run it.
@ -104,16 +103,16 @@ 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}
CTR_FQIN: ${UBUNTU_CONTAINER_FQIN} # CTR_FQIN: ${UBUNTU_CONTAINER_FQIN}
CI_DESIRED_RUNTIME: runc # CI_DESIRED_RUNTIME: runc
env: env:
TEST_FLAVOR: build TEST_FLAVOR: build
# NOTE: The default way Cirrus-CI clones is *NOT* compatible with # NOTE: The default way Cirrus-CI clones is *NOT* compatible with
@ -592,10 +591,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:
@ -835,32 +835,32 @@ buildah_bud_test_task:
always: *int_logs_artifacts always: *int_logs_artifacts
rootless_gitlab_test_task: #rootless_gitlab_test_task:
name: *std_name_fmt # name: *std_name_fmt
alias: rootless_gitlab_test # alias: rootless_gitlab_test
# Docs: ./contrib/cirrus/CIModes.md # # Docs: ./contrib/cirrus/CIModes.md
only_if: &cirrus_cron "${CIRRUS_CRON} == 'main'" # only_if: &cirrus_cron "${CIRRUS_CRON} == 'main'"
# Community-maintained downstream test may fail unexpectedly. # # Community-maintained downstream test may fail unexpectedly.
# Ref. repository: https://gitlab.com/gitlab-org/gitlab-runner # # Ref. repository: https://gitlab.com/gitlab-org/gitlab-runner
# If necessary, uncomment the next line and file issue(s) with details. # # If necessary, uncomment the next line and file issue(s) with details.
# allow_failures: $CI == $CI # # allow_failures: $CI == $CI
depends_on: # depends_on:
- build # - build
- rootless_integration_test # - rootless_integration_test
gce_instance: *standardvm # gce_instance: *standardvm
env: # env:
<<: *ubuntu_envvars # <<: *ubuntu_envvars
TEST_FLAVOR: 'gitlab' # TEST_FLAVOR: 'gitlab'
PRIV_NAME: rootless # PRIV_NAME: rootless
clone_script: *get_gosrc # clone_script: *get_gosrc
setup_script: *setup # setup_script: *setup
main_script: *main # main_script: *main
always: # always:
<<: *logs_artifacts # <<: *logs_artifacts
junit_artifacts: # junit_artifacts:
path: gitlab-runner-podman.xml # path: gitlab-runner-podman.xml
type: text/xml # type: text/xml
format: junit # format: junit
upgrade_test_task: upgrade_test_task:
@ -949,10 +949,11 @@ 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 # DISABLED:
# ${UBUNTU_CACHE_IMAGE_NAME}
IMGNAMES: >- IMGNAMES: >-
${FEDORA_CACHE_IMAGE_NAME} ${FEDORA_CACHE_IMAGE_NAME}
${UBUNTU_CACHE_IMAGE_NAME} ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
build-push-${IMAGE_SUFFIX} build-push-${IMAGE_SUFFIX}
EC2IMGNAMES: >- EC2IMGNAMES: >-
${FEDORA_AARCH64_AMI} ${FEDORA_AARCH64_AMI}
@ -1003,7 +1004,7 @@ success_task:
- rootless_remote_system_test - rootless_remote_system_test
- minikube_test - minikube_test
- buildah_bud_test - buildah_bud_test
- rootless_gitlab_test #- rootless_gitlab_test
- upgrade_test - upgrade_test
- image_build - image_build
- meta - meta

12
contrib/cirrus/lib.sh
View File

@ -207,7 +207,16 @@ use_cni() {
echo "unset NETWORK_BACKEND" >> /etc/ci_environment echo "unset NETWORK_BACKEND" >> /etc/ci_environment
export -n NETWORK_BACKEND export -n NETWORK_BACKEND
unset NETWORK_BACKEND unset NETWORK_BACKEND
# While it's possible a user may want both installed, for CNI CI testing
# purposes we only care about backward-compatibility, not forward.
# If both CNI & netavark are present, in some situations where --root
# is used it's possible for podman to pick the "wrong" networking stack.
msg "Force-removing netavark and aardvark-dns"
# Other packages depend on nv/av, but we're testing with podman
# binaries built from source, so it's safe to ignore these deps.
rpm -e --nodeps netavark aardvark-dns
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
@ -227,6 +236,9 @@ use_netavark() {
export NETWORK_BACKEND=netavark # needed for install_test_configs() export NETWORK_BACKEND=netavark # needed for install_test_configs()
msg "Removing any/all CNI configuration" msg "Removing any/all CNI configuration"
rm -rvf /etc/cni/net.d/* rm -rvf /etc/cni/net.d/*
# N/B: The netavark/aardvark-dns packages are still installed and
# available. This is on purpose, since CI needs to verify the
# selection mechanisms are functional when both are available.
} }
# Remove all files provided by the distro version of podman. # Remove all files provided by the distro version of podman.

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
;; ;;