rootfs-builder: remove EulerOS

EulerOS does not work with rust agent. further info: https://github.com/kata-containers/osbuilder/issues/387 Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
2025-09-18 15:28:10 +00:00 · 2020-04-30 08:27:25 -05:00
parent 586d26480c
commit 629cc0ae8d
6 changed files with 8 additions and 145 deletions
--- a/tools/osbuilder/README.md
+++ b/tools/osbuilder/README.md
@@ -204,9 +204,9 @@ of the the osbuilder distributions.
 > Note: this table is not relevant for the dracut build method, since it supports
 any Linux distribution and architecture where dracut is available.

-|           |Alpine            |CentOS            |Clear Linux       |Debian/Ubuntu     |EulerOS           |Fedora            |openSUSE          |
-|--         |--                |--                |--                |--                |--                |--                |--                |
-|**ARM64**  |:heavy_check_mark:|:heavy_check_mark:|                  |                  |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
-|**PPC64le**|:heavy_check_mark:|:heavy_check_mark:|                  |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
-|**s390x**  |:heavy_check_mark:|                  |                  |:heavy_check_mark:|                  |:heavy_check_mark:|                  |
-|**x86_64** |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
+|           |Alpine            |CentOS            |Clear Linux       |Debian/Ubuntu     |Fedora            |openSUSE          |
+|--         |--                |--                |--                |--                |--                |--                |
+|**ARM64**  |:heavy_check_mark:|:heavy_check_mark:|                  |                  |:heavy_check_mark:|:heavy_check_mark:|
+|**PPC64le**|:heavy_check_mark:|:heavy_check_mark:|                  |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
+|**s390x**  |:heavy_check_mark:|                  |                  |:heavy_check_mark:|:heavy_check_mark:|                  |
+|**x86_64** |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
--- a/tools/osbuilder/rootfs-builder/euleros/Dockerfile.in
+++ b/tools/osbuilder/rootfs-builder/euleros/Dockerfile.in
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2018 Huawei Technologies Co., Ltd
-#
-# SPDX-License-Identifier: Apache-2.0
-
-FROM docker.io/euleros:@OS_VERSION@
-
-@SET_PROXY@
-
-RUN yum -y update && yum install -y \
-    autoconf \
-    automake \
-    binutils \
-    chrony \
-    coreutils \
-    curl \
-    gcc \
-    gcc-c++ \
-    git \
-    glibc-common \
-    glibc-devel \
-    glibc-headers \
-    glibc-static \
-    glibc-utils \
-    libstdc++-devel \
-    libstdc++-static \
-    m4 \
-    make \
-    sed \
-    tar \
-    vim \
-    which \
-    yum
-
-# This will install the proper golang to build Kata components
-@INSTALL_GO@
-
-# several problems prevent us from building rust agent on euleros
-# 1. There is no libstdc++.a. copy one from somewhere get through
-#    compilation
-# 2. The kernel (3.10.x) is too old, kernel-headers pacakge
-# has no vm_socket.h because kernel has no vsock support or
-# vsock header files
-
-# We will disable rust agent build in rootfs.sh for euleros
-# and alpine(musl cannot support proc-macro)
--- a/tools/osbuilder/rootfs-builder/euleros/RPM-GPG-KEY-EulerOS
+++ b/tools/osbuilder/rootfs-builder/euleros/RPM-GPG-KEY-EulerOS
@@ -1,52 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
-
-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
-qSxRE/XMoebNx2CFQwFp7izDHwuG6uRRUQQ=
-=3beT
-----END PGP PUBLIC KEY BLOCK-----
--- a/tools/osbuilder/rootfs-builder/euleros/config.sh
+++ b/tools/osbuilder/rootfs-builder/euleros/config.sh
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2018 Huawei Technologies Co., Ltd
-#
-# SPDX-License-Identifier: Apache-2.0
-OS_NAME="EulerOS"
-
-OS_VERSION=${OS_VERSION:-2.2}
-
-BASE_URL="http://developer.huawei.com/ict/site-euleros/euleros/repo/yum/${OS_VERSION}/os/${ARCH}/"
-
-GPG_KEY_FILE="RPM-GPG-KEY-EulerOS"
-
-PACKAGES="iptables chrony"
-
-#Optional packages:
-# systemd: An init system that will start kata-agent if kata-agent
-#          itself is not configured as init process.
-[ "$AGENT_INIT" == "no" ] && PACKAGES+=" systemd" || true
-
-# Init process must be one of {systemd,kata-agent}
-INIT_PROCESS=systemd
-# List of zero or more architectures to exclude from build,
-# as reported by  `uname -m`
-ARCH_EXCLUDE_LIST=( aarch64 ppc64le s390x )
-# Allow the build to fail without generating an error.
-# For more info see: https://github.com/kata-containers/osbuilder/issues/190
-BUILD_CAN_FAIL=1
-
-[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true
--- a/tools/osbuilder/rootfs-builder/rootfs.sh
+++ b/tools/osbuilder/rootfs-builder/rootfs.sh
@@ -623,18 +623,11 @@ parse_arguments()
 	distro="$1"
 	arch=$(uname -m)

-	if [ "${distro}" == "alpine" -o "${distro}" == "euleros" ]; then
+	if [ "${distro}" == "alpine" ]; then
 		if [ "${RUST_AGENT}" == "yes" ]; then
 			die "rust agent cannot be built on ${distro}.
 alpine: only has stable/nightly-x86_64-unknown-linux-musl toolchain. It does not support proc-macro compilation.
-See issue: https://github.com/kata-containers/osbuilder/issues/386
-euleros: 1. Missing libstdc++.a
-         2. kernel is 3.10.x, there is no vsock support
-You can build rust agent on your host and then copy it into
-image's rootfs(eg. rootfs-builder/rootfs/usr/bin), and then
-use image_builder.sh to build image with the rootfs. Please
-refer to documentation for how to use customer agent.
-See issue: https://github.com/kata-containers/osbuilder/issues/387"
+See issue: https://github.com/kata-containers/osbuilder/issues/386"
 		fi
 	fi

--- a/tools/osbuilder/tests/test_config.sh
+++ b/tools/osbuilder/tests/test_config.sh
@@ -17,7 +17,6 @@ test_distros+=("ubuntu")

 skipForRustDistros=()
 skipForRustDistros+=("alpine")
-skipForRustDistros+=("euleros")

 skipForRustArch=()
 skipForRustArch+=("ppc64le")
@@ -36,8 +35,6 @@ distro_in_set() {
 }

 if [ -n "${CI:-}" ]; then
-	# CI tests may timeout with euleros, see:
-	#  https://github.com/kata-containers/osbuilder/issues/46"
 	# Since too many distros timeout for now, we only test clearlinux and ubuntu. We can enable other distros when we fix timeout problem.
 	for distro in "${distros[@]}"; do
 		if distro_in_set "${distro}" "${test_distros[@]}"; then