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

Cirrus: Guarantee CNI testing w/o nv/av present

Browse Source 
Comments added to code for clarity.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2022-11-02 13:37:49 -04:00
parent fd9de876f1
commit 8530724555
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/cirrus/lib.sh
View File

@ -207,6 +207,14 @@ 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* dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-plugins*
cd $GOSRC || exit 1 cd $GOSRC || exit 1
@ -228,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.