Skip to content

Commit 774e950

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #15760 from cevich/enable_kube_tests
Cirrus: Update CI VM images to F37beta
2 parents c35ed35 + 8530724 commit 774e950

File tree

3 files changed

+70
-57
lines changed

3 files changed

+70
-57
lines changed

‎.cirrus.yml

+51-50
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,23 @@ env:
2727
#### Cache-image names to test with (double-quotes around names are critical)
2828
#### Comment out fedora-35 for podman 4.x branches.
2929
####
30-
FEDORA_NAME: "fedora-36"
30+
FEDORA_NAME: "fedora-37"
3131
FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64"
32-
#PRIOR_FEDORA_NAME: "fedora-35"
32+
PRIOR_FEDORA_NAME: "fedora-36"
3333
UBUNTU_NAME: "ubuntu-2204"
3434

3535
# Image identifiers
36-
IMAGE_SUFFIX: "c4678746211876864"
36+
IMAGE_SUFFIX: "c5178639502278656"
3737
# EC2 images
3838
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
3939
FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}"
4040
# GCP Images
4141
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
42-
#PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
43-
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
42+
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
43+
#UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
4444
# Container FQIN's
4545
FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}"
46-
#PRIOR_FEDORA_CONTAINER_FQIN: "quay.io/libpod/prior-fedora_podman:${IMAGE_SUFFIX}"
47-
UBUNTU_CONTAINER_FQIN: "quay.io/libpod/ubuntu_podman:${IMAGE_SUFFIX}"
46+
PRIOR_FEDORA_CONTAINER_FQIN: "quay.io/libpod/prior-fedora_podman:${IMAGE_SUFFIX}"
4847
WINDOWS_AMI: "win-server-wsl-c5138587457421312" # Replace with IMAGE_SUFFIX when aligned
4948
####
5049
#### Control variables that determine what to run and how to run it.
@@ -104,16 +103,16 @@ build_task:
104103
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
105104
# ID for re-use of build output
106105
CI_DESIRED_RUNTIME: crun
107-
#- env: &priorfedora_envvars
108-
# DISTRO_NV: ${PRIOR_FEDORA_NAME}
109-
# VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
110-
# CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
111-
# CI_DESIRED_RUNTIME: crun
112-
- env: &ubuntu_envvars
113-
DISTRO_NV: ${UBUNTU_NAME}
114-
VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME}
115-
CTR_FQIN: ${UBUNTU_CONTAINER_FQIN}
116-
CI_DESIRED_RUNTIME: runc
106+
- env: &priorfedora_envvars
107+
DISTRO_NV: ${PRIOR_FEDORA_NAME}
108+
VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
109+
CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
110+
CI_DESIRED_RUNTIME: crun
111+
#- env: &ubuntu_envvars
112+
# DISTRO_NV: ${UBUNTU_NAME}
113+
# VM_IMAGE_NAME: ${UBUNTU_CACHE_IMAGE_NAME}
114+
# CTR_FQIN: ${UBUNTU_CONTAINER_FQIN}
115+
# CI_DESIRED_RUNTIME: runc
117116
env:
118117
TEST_FLAVOR: build
119118
# NOTE: The default way Cirrus-CI clones is *NOT* compatible with
@@ -592,10 +591,11 @@ container_integration_test_task:
592591
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
593592
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
594593
CI_DESIRED_RUNTIME: crun
595-
#- env:
596-
# DISTRO_NV: ${PRIOR_FEDORA_NAME}
597-
# VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
598-
# CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
594+
- env:
595+
DISTRO_NV: ${PRIOR_FEDORA_NAME}
596+
VM_IMAGE_NAME: ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
597+
CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
598+
CI_DESIRED_RUNTIME: crun
599599
gce_instance: *standardvm
600600
timeout_in: 90m
601601
env:
@@ -835,32 +835,32 @@ buildah_bud_test_task:
835835
always: *int_logs_artifacts
836836

837837

838-
rootless_gitlab_test_task:
839-
name: *std_name_fmt
840-
alias: rootless_gitlab_test
841-
# Docs: ./contrib/cirrus/CIModes.md
842-
only_if: &cirrus_cron "${CIRRUS_CRON} == 'main'"
843-
# Community-maintained downstream test may fail unexpectedly.
844-
# Ref. repository: https://gitlab.com/gitlab-org/gitlab-runner
845-
# If necessary, uncomment the next line and file issue(s) with details.
846-
# allow_failures: $CI == $CI
847-
depends_on:
848-
- build
849-
- rootless_integration_test
850-
gce_instance: *standardvm
851-
env:
852-
<<: *ubuntu_envvars
853-
TEST_FLAVOR: 'gitlab'
854-
PRIV_NAME: rootless
855-
clone_script: *get_gosrc
856-
setup_script: *setup
857-
main_script: *main
858-
always:
859-
<<: *logs_artifacts
860-
junit_artifacts:
861-
path: gitlab-runner-podman.xml
862-
type: text/xml
863-
format: junit
838+
#rootless_gitlab_test_task:
839+
# name: *std_name_fmt
840+
# alias: rootless_gitlab_test
841+
# # Docs: ./contrib/cirrus/CIModes.md
842+
# only_if: &cirrus_cron "${CIRRUS_CRON} == 'main'"
843+
# # Community-maintained downstream test may fail unexpectedly.
844+
# # Ref. repository: https://gitlab.com/gitlab-org/gitlab-runner
845+
# # If necessary, uncomment the next line and file issue(s) with details.
846+
# # allow_failures: $CI == $CI
847+
# depends_on:
848+
# - build
849+
# - rootless_integration_test
850+
# gce_instance: *standardvm
851+
# env:
852+
# <<: *ubuntu_envvars
853+
# TEST_FLAVOR: 'gitlab'
854+
# PRIV_NAME: rootless
855+
# clone_script: *get_gosrc
856+
# setup_script: *setup
857+
# main_script: *main
858+
# always:
859+
# <<: *logs_artifacts
860+
# junit_artifacts:
861+
# path: gitlab-runner-podman.xml
862+
# type: text/xml
863+
# format: junit
864864

865865

866866
upgrade_test_task:
@@ -949,10 +949,11 @@ meta_task:
949949
image: quay.io/libpod/imgts:latest
950950
env:
951951
# Space-separated list of images used by this repository state
952-
# Disabled ${PRIOR_FEDORA_CACHE_IMAGE_NAME} for Fedora 35
952+
# DISABLED:
953+
# ${UBUNTU_CACHE_IMAGE_NAME}
953954
IMGNAMES: >-
954955
${FEDORA_CACHE_IMAGE_NAME}
955-
${UBUNTU_CACHE_IMAGE_NAME}
956+
${PRIOR_FEDORA_CACHE_IMAGE_NAME}
956957
build-push-${IMAGE_SUFFIX}
957958
EC2IMGNAMES: >-
958959
${FEDORA_AARCH64_AMI}
@@ -1003,7 +1004,7 @@ success_task:
10031004
- rootless_remote_system_test
10041005
- minikube_test
10051006
- buildah_bud_test
1006-
- rootless_gitlab_test
1007+
#- rootless_gitlab_test
10071008
- upgrade_test
10081009
- image_build
10091010
- meta

‎contrib/cirrus/lib.sh

+12
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,16 @@ use_cni() {
207207
echo "unset NETWORK_BACKEND" >> /etc/ci_environment
208208
export -n NETWORK_BACKEND
209209
unset NETWORK_BACKEND
210+
# While it's possible a user may want both installed, for CNI CI testing
211+
# purposes we only care about backward-compatibility, not forward.
212+
# If both CNI & netavark are present, in some situations where --root
213+
# is used it's possible for podman to pick the "wrong" networking stack.
214+
msg "Force-removing netavark and aardvark-dns"
215+
# Other packages depend on nv/av, but we're testing with podman
216+
# binaries built from source, so it's safe to ignore these deps.
217+
rpm -e --nodeps netavark aardvark-dns
210218
msg "Installing default CNI configuration"
219+
dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-plugins*
211220
cd $GOSRC || exit 1
212221
rm -rvf /etc/cni/net.d
213222
mkdir -p /etc/cni/net.d
@@ -227,6 +236,9 @@ use_netavark() {
227236
export NETWORK_BACKEND=netavark # needed for install_test_configs()
228237
msg "Removing any/all CNI configuration"
229238
rm -rvf /etc/cni/net.d/*
239+
# N/B: The netavark/aardvark-dns packages are still installed and
240+
# available. This is on purpose, since CI needs to verify the
241+
# selection mechanisms are functional when both are available.
230242
}
231243

232244
# Remove all files provided by the distro version of podman.

‎contrib/cirrus/setup_environment.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -126,19 +126,19 @@ case "$OS_RELEASE_ID" in
126126
setsebool container_manage_cgroup true
127127
fi
128128

129-
# For release 36 and later, netavark/aardvark is the default
130-
# networking stack for podman. All previous releases only have
131-
# CNI networking available. Upgrading from one to the other is
132-
# not supported at this time. Support execution of the upgrade
133-
# tests in F36 and later, by disabling Netavark and enabling CNI.
129+
# For the latest Fedora CI VM images, netavark/aardvark is the
130+
# intended networking stack for podman. All previous VM images
131+
# should use CNI networking. Upgrading from one to the other is
132+
# not supported at this time. The only exception in CI is
133+
# the "upgrade tests" which must always use CNI.
134134
#
135135
# OS_RELEASE_VER is defined by automation-library
136136
# shellcheck disable=SC2154
137-
if [[ "$OS_RELEASE_VER" -ge 36 ]] && \
137+
if [[ "$DISTRO_NV" != "$PRIOR_FEDORA_NAME" ]] && \
138138
[[ "$TEST_FLAVOR" != "upgrade_test" ]];
139139
then
140140
use_netavark
141-
else # Fedora < 36, or upgrade testing.
141+
else # Fedora N-1 or upgrade testing.
142142
use_cni
143143
fi
144144
;;

0 commit comments

Comments
 (0)