docker: add rockylinux:9

Closes #415 Signed-off-by: Seow, Wen Jie <[email protected]> Co-authored-by: Wei Shan <[email protected]>
intel · Mar 5, 2025 · 1c87076 · 1c87076
1 parent 3dea438
commit 1c87076
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 4 deletions.
diff --git a/distro/adaptation-pkg/rocky b/distro/adaptation-pkg/rocky
@@ -0,0 +1 @@
+centos
diff --git a/distro/adaptation/centos-9 b/distro/adaptation/centos-9
@@ -13,7 +13,7 @@ grub-common: grub2-common
 libbabeltrace-ctf-dev: libbabeltrace-devel
 libbabeltrace-ctf1: libbabeltrace
 libbabeltrace-dev: libbabeltrace-devel
-libbpf-dev: libbpf-devel-1.3.0
+libbpf-dev: libbpf-devel
 libclang-dev: clang-devel
 libcunit1-dev: CUnit-devel
 libdw1: libdwarves1

diff --git a/distro/adaptation/rocky b/distro/adaptation/rocky
@@ -0,0 +1 @@
+centos
diff --git a/distro/adaptation/rocky-9 b/distro/adaptation/rocky-9
@@ -0,0 +1 @@
+centos-9
diff --git a/distro/installer/rocky b/distro/installer/rocky
@@ -0,0 +1 @@
+centos
diff --git a/docker/rockylinux/Dockerfile b/docker/rockylinux/Dockerfile
@@ -0,0 +1,27 @@
+# base image can be fedora:38, fedora:39 and etc
+ARG base_image
+FROM ${base_image}
+
+# lkp install generates hosts/$HOSTNAME during create_host_config. Here it requires
+# user to pass hostname arg to specify a consistent name instead of the container
+# hostname when building the image.
+ARG hostname=lkp-docker
+ENV HOSTNAME=${hostname}
+
+WORKDIR /lkp/lkp-tests
+
+COPY . ./
+
+RUN dnf upgrade -y && \
+    dnf install -y \
+    # kernel-tools installs turbostat
+    kernel-tools \
+    make \
+    # procps installs vmstat, sysctl, etc to partially persistent commonly used dependencies
+    procps \
+    perf \
+    hostname && \
+    make install && \
+    lkp install
+
+ENTRYPOINT ["bash", "-c", "sleep infinity"]
diff --git a/lib/detect-system.sh b/lib/detect-system.sh
@@ -152,6 +152,12 @@ detect_system()
 	then
 		_system_version="$(awk -F'=' '$1=="VERSION_ID"{gsub(/"/,"");print $2}'  ${rootfs}/etc/os-release | head -n 1)"
 		_system_name="Amazon Linux"
+    elif
+        [ -f ${rootfs}/etc/os-release ] &&
+            GREP_OPTIONS="" \command \grep 'ID="rocky"' ${rootfs}/etc/os-release >/dev/null
+    then
+        _system_name="Rocky"
+        _system_version="$(awk -F'=' '$1=="VERSION_ID"{gsub(/"/,"");print $2}' ${rootfs}/etc/os-release | awk -F'.' '{print $1}' | head -n 1)"
 	elif
 		[ -f ${rootfs}/etc/os-release ] &&
 			(GREP_OPTIONS="" \command \grep 'ID="opensuse-leap"' ${rootfs}/etc/os-release >/dev/null ||

diff --git a/lib/install.sh b/lib/install.sh
@@ -16,7 +16,7 @@ sync_distro_sources()
 		else
 			yum update
 		fi ;;
-	redhat) yum update ;;
+	redhat|rocky) yum update ;;
 	archlinux) yay -Sy --needed;;
 	opensuse)
 		zypper update ;;
@@ -151,6 +151,9 @@ map_python_packages()
 		opensuse-*)
 			map_python2_to_python3
 			;;
+		rocky-[9]*)
+			map_python2_to_python3
+			;;
 	esac
 }
 

diff --git a/lkp-exec/install b/lkp-exec/install
@@ -364,7 +364,7 @@ install_base_support()
 	create_host_config
 }
 
-enable_centos_source()
+enable_source_repository()
 {
 	if ! yum list installed | grep -q yum-utils; then
 		yum install -y yum-utils
@@ -388,7 +388,10 @@ distro=$_system_name_lowercase
 echo "distro=$distro"
 echo "version=$_system_version"
 
-[ "$distro" = "centos" ] && enable_centos_source
+# Enable source repositories for CentOS and Rocky Linux
+if [ "$distro" = "centos" ] || [ "$distro" = "rocky" ]; then
+    enable_source_repository
+fi
 
 DISTRO=$distro
 export DISTRO