From 767c305c5bdd3067811f84227295c55b279838eb Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 13 Nov 2024 11:50:54 +0100 Subject: [PATCH] Disable IPv6 in CI Signed-off-by: Sascha Grunert --- test/scripts/install-deb.sh | 2 +- test/scripts/install-rpm.sh | 2 +- test/scripts/test.sh | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/scripts/install-deb.sh b/test/scripts/install-deb.sh index df1a36a..f856055 100755 --- a/test/scripts/install-deb.sh +++ b/test/scripts/install-deb.sh @@ -28,7 +28,7 @@ echo "deb [signed-by=/etc/apt/keyrings/cri-o-apt-keyring.gpg] https://download.o apt-get update -apt-get install -y cri-o +apt-get install -y cri-o jq if [ -z $CRIO_ONLY ]; then apt-get install -y kubelet kubeadm kubectl fi diff --git a/test/scripts/install-rpm.sh b/test/scripts/install-rpm.sh index fe9e60e..c8b4532 100755 --- a/test/scripts/install-rpm.sh +++ b/test/scripts/install-rpm.sh @@ -39,7 +39,7 @@ gpgcheck=1 gpgkey=https://download.opensuse.org/repositories/isv:/kubernetes:/addons:/cri-o:/$PROJECT_PATH:/build/rpm/repodata/repomd.xml.key EOF -dnf install -y cri-o +dnf install -y cri-o jq if [ -z $CRIO_ONLY ]; then dnf install -y container-selinux kubelet kubeadm kubectl fi diff --git a/test/scripts/test.sh b/test/scripts/test.sh index e2c2d89..23a2871 100755 --- a/test/scripts/test.sh +++ b/test/scripts/test.sh @@ -6,6 +6,11 @@ set -euxo pipefail # It expects all required packages (kube*, cri-o) are already installed # It is referenced from ../deb/Vagrantfile and ../rpm/Vagrantfile +# Disable IPv6 for CI +CNI_CONFIG=/etc/cni/net.d/10-crio-bridge.conflist +jq 'del(.plugins[0].ipam.routes[1], .plugins[0].ipam.ranges[1])' $CNI_CONFIG >tmp +mv tmp $CNI_CONFIG + systemctl start crio # Disable swap