From 344e0580cac9c67cf098d1e0121c354f6a81bca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Sat, 27 Jan 2024 10:41:39 +0100
Subject: [PATCH] tests: cri-o: Use packages from pkgs.k8s.io
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CRI-O has moved, for a long time, towards pkgs.k8s.io, see:
https://kubernetes.io/blog/2023/10/10/cri-o-community-package-infrastructure/

With this the OBS repo won't be used anymore.

Fixes: #8935

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 tests/common.bash | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/tests/common.bash b/tests/common.bash
index 30a6197f48..7b91675545 100644
--- a/tests/common.bash
+++ b/tests/common.bash
@@ -571,29 +571,20 @@ function install_nydus_snapshotter() {
 	rm -f "${tarball_name}"
 }
 
-function _get_os_for_crio() {
-	source /etc/os-release
-
-	if [ "${NAME}" != "Ubuntu" ]; then
-		echo "Only Ubuntu is supported for now"
-		exit 2
-	fi
-
-	echo "x${NAME}_${VERSION_ID}"
-}
-
 # version: the CRI-O version to be installe
 function install_crio() {
 	local version=${1}
 
-	os=$(_get_os_for_crio)
+	sudo mkdir -p /etc/apt/keyrings
+	sudo mkdir -p /etc/apt/sources.list.d
+
+	curl -fsSL https://pkgs.k8s.io/addons:/cri-o:/stable:/v${version}/deb/Release.key | \
+		sudo gpg --dearmor -o /etc/apt/keyrings/cri-o-apt-keyring.gpg
+	echo "deb [signed-by=/etc/apt/keyrings/cri-o-apt-keyring.gpg] https://pkgs.k8s.io/addons:/cri-o:/stable:/v${version}/deb/ /" | \
+		sudo tee /etc/apt/sources.list.d/cri-o.list
 
-	echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/${os}/ /"|sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
-	echo "deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${version}/${os}/ /"|sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable:cri-o:${version}.list
-	curl -L https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable:cri-o:${version}/${os}/Release.key | sudo apt-key add -
-	curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/${os}/Release.key | sudo apt-key add -
 	sudo apt update
-	sudo apt install -y cri-o cri-o-runc
+	sudo apt install -y cri-o
 
 	# We need to set the default capabilities to ensure our tests will pass
 	# See: https://github.com/kata-containers/kata-containers/issues/8034