diff --git a/.ci/configure_crio_for_kata.sh b/.ci/configure_crio_for_kata.sh index 29b2b0b8e..9b7ea1d69 100755 --- a/.ci/configure_crio_for_kata.sh +++ b/.ci/configure_crio_for_kata.sh @@ -10,12 +10,6 @@ set -o nounset set -o pipefail source /etc/os-release || source /usr/lib/os-release -issue="https://github.com/cri-o/cri-o/issues/3130" - -if [ "$ID" == "centos" ]; then - echo "Skip CRI-O installation on $ID, see: $issue" - exit -fi crio_config_file="/etc/crio/crio.conf" runc_flag="\/usr\/local\/bin\/crio-runc" diff --git a/.ci/install_crio.sh b/.ci/install_crio.sh index 056a1e4ec..82932eca4 100755 --- a/.ci/install_crio.sh +++ b/.ci/install_crio.sh @@ -12,12 +12,6 @@ set -o pipefail cidir=$(dirname "$0") source "${cidir}/lib.sh" source /etc/os-release || source /usr/lib/os-release -issue="https://github.com/cri-o/cri-o/issues/3130" - -if [ "$ID" == "centos" ]; then - echo "Skip CRI-O installation on $ID, see: $issue" - exit -fi echo "Install go-md2man" go_md2man_url=$(get_test_version "externals.go-md2man.url") @@ -93,7 +87,7 @@ if [ "$ID" == "centos" ] || [ "$ID" == "fedora" ]; then # This is necessary to avoid crashing `make` with `No package devmapper found` # by disabling the devmapper driver when the library it requires is not installed sed -i 's|$(shell hack/selinux_tag.sh)||' Makefile - make BUILDTAGS='exclude_graphdriver_devicemapper libdm_no_deferred_remove' + make BUILDTAGS='exclude_graphdriver_devicemapper exclude_graphdriver_btrfs libdm_no_deferred_remove' else make fi diff --git a/.ci/install_kubernetes.sh b/.ci/install_kubernetes.sh index 749a0487e..c6bba1b81 100755 --- a/.ci/install_kubernetes.sh +++ b/.ci/install_kubernetes.sh @@ -33,10 +33,6 @@ EOF" chronic sudo -E apt update chronic sudo -E apt install --allow-downgrades -y kubelet="$kubernetes_version" kubeadm="$kubernetes_version" kubectl="$kubernetes_version" elif [ "$ID" == "centos" ] || [ "$ID" == "fedora" ]; then - if [ "$ID" == "centos" ]; then - sudo yum versionlock docker-ce - fi - sudo bash -c "cat < /etc/yum.repos.d/kubernetes.repo [kubernetes] name=Kubernetes diff --git a/.ci/setup_env_centos.sh b/.ci/setup_env_centos.sh index 38c0314c3..13d76c8ab 100755 --- a/.ci/setup_env_centos.sh +++ b/.ci/setup_env_centos.sh @@ -62,7 +62,7 @@ declare -A packages=( \ [kata_containers_dependencies]="libtool libtool-ltdl-devel device-mapper-persistent-data lvm2 libtool-ltdl" \ [qemu_dependencies]="libcap-devel libcap-ng-devel libattr-devel libcap-ng-devel librbd1-devel flex libfdt-devel libpmem-devel" \ [kernel_dependencies]="elfutils-libelf-devel flex pkgconfig patch" \ - [crio_dependencies]="libassuan-devel libgpg-error-devel device-mapper-libs util-linux libselinux-devel" \ + [crio_dependencies]="glibc-static libassuan-devel libgpg-error-devel device-mapper-libs util-linux libselinux-devel" \ [bison_binary]="bison" \ [libgudev1-dev]="libgudev1-devel" \ [general_dependencies]="gpgme-devel glib2-devel glibc-devel bzip2 m4 gettext-devel automake autoconf pixman-devel coreutils" \