From 54ba9d75040a9bf351110fc0eac1491e283f7edf Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Wed, 8 Nov 2023 06:48:52 +0000 Subject: [PATCH 1/3] correct tarball build directory Depends-on: github.com/kata-containers/kata-containers#8430 --- .ci/aarch64/configuration_aarch64.yaml | 2 -- .ci/aarch64/install_rom_aarch64.sh | 2 +- .ci/install_kata_kernel.sh | 3 +++ .ci/install_qemu.sh | 12 ++++++++++-- .ci/lib.sh | 3 ++- .ci/run.sh | 2 ++ 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.ci/aarch64/configuration_aarch64.yaml b/.ci/aarch64/configuration_aarch64.yaml index 8474a67fc..06f7677da 100644 --- a/.ci/aarch64/configuration_aarch64.yaml +++ b/.ci/aarch64/configuration_aarch64.yaml @@ -12,9 +12,7 @@ test: - cri-containerd kubernetes: - - k8s-cpu-ns - k8s-limit-range - - k8s-number-cpus - k8s-expose-ip - k8s-oom - k8s-block-volume diff --git a/.ci/aarch64/install_rom_aarch64.sh b/.ci/aarch64/install_rom_aarch64.sh index 4b0476960..5751f8a52 100755 --- a/.ci/aarch64/install_rom_aarch64.sh +++ b/.ci/aarch64/install_rom_aarch64.sh @@ -55,7 +55,7 @@ build_uefi() git clone "${EDK2_PLAT_REPO}" git clone -b "${ACPICA_TAG_ID}" "${ACPICA}" - sudo apt install -y python python3 python3-distutils uuid-dev build-essential bison flex + sudo apt install -y python3 python3-distutils uuid-dev build-essential bison flex mkdir toolchain pushd toolchain/ diff --git a/.ci/install_kata_kernel.sh b/.ci/install_kata_kernel.sh index ebeb5db85..a5db17c1f 100755 --- a/.ci/install_kata_kernel.sh +++ b/.ci/install_kata_kernel.sh @@ -77,6 +77,9 @@ main() { experimental) build_and_install_kernel "kernel-experimental" ;; + arm-experimental) + build_and_install_kernel "kernel-arm-experimental" + ;; vanilla) build_and_install_kernel "kernel" ;; diff --git a/.ci/install_qemu.sh b/.ci/install_qemu.sh index d2df296fd..7621c07be 100755 --- a/.ci/install_qemu.sh +++ b/.ci/install_qemu.sh @@ -90,13 +90,16 @@ main() { vanilla) qemu_type="qemu" ;; + arm-experimental) + qemu_type="qemu-arm-experimental" + ;; *) die_unsupported_qemu_type "$qemu_type" ;; esac case ${QEMU_ARCH} in - "aarch64"|"ppc64le") + "ppc64le") # We're still no there for using the kata-deploy # scripts with ppc64le and aarch64. CURRENT_QEMU_VERSION=$(get_version "assets.hypervisor.qemu.version") @@ -110,8 +113,13 @@ main() { build_and_install_qemu ;; - "x86_64"|"s390x") + "aarch64"|"x86_64"|"s390x") build_static_artifact_and_install "${qemu_type}" + # Install UEFI ROM for qemu + ENABLE_ARM64_UEFI="${ENABLE_ARM64_UEFI:-true}" + [ "${ENABLE_ARM64_UEFI}" == "true" ] && ${cidir}/aarch64/install_rom_aarch64.sh + sudo rm -f /opt/kata/bin/qemu-system-aarch64 + sudo ln -s /opt/kata/bin/qemu-system-aarch64-arm-experimental /opt/kata/bin/qemu-system-aarch64 ;; *) die "Architecture ${QEMU_ARCH} not supported" diff --git a/.ci/lib.sh b/.ci/lib.sh index 7156a3a26..c783bc0c2 100755 --- a/.ci/lib.sh +++ b/.ci/lib.sh @@ -173,8 +173,9 @@ function build_static_artifact_and_install() { clone_katacontainers_repo - pushd "$katacontainers_repo_dir" >/dev/null + pushd "$katacontainers_repo_dir/tools/packaging/kata-deploy/local-build" >/dev/null sudo -E PATH=$PATH make "$make_target" + pwd sudo tar -xvJpf "build/${tarball}" -C "${destdir}" sudo rm -rf "build/" popd >/dev/null diff --git a/.ci/run.sh b/.ci/run.sh index 227351d9d..35a3a1305 100755 --- a/.ci/run.sh +++ b/.ci/run.sh @@ -66,6 +66,8 @@ case "${CI_JOB}" in echo "INFO: Running Confidential Container tests" sudo -E PATH="$PATH" CRI_RUNTIME="containerd" bash -c "make cc-containerd" fi + echo "INFO: Running kubernetes tests" + sudo -E PATH="$PATH" CRI_RUNTIME="containerd" bash -c "make kubernetes" echo "INFO: Running runk test" sudo -E PATH="$PATH" CRI_RUNTIME="containerd" bash -c "make runk" ;; From 54197522f362176fe3c4aaf25fac0b5c4ad4ce1f Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Tue, 21 Nov 2023 08:49:44 +0000 Subject: [PATCH 2/3] disable k8s-seccomp and k8s-empty-dirs test on aarch64 --- .ci/aarch64/configuration_aarch64.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci/aarch64/configuration_aarch64.yaml b/.ci/aarch64/configuration_aarch64.yaml index 06f7677da..0612b958d 100644 --- a/.ci/aarch64/configuration_aarch64.yaml +++ b/.ci/aarch64/configuration_aarch64.yaml @@ -12,6 +12,8 @@ test: - cri-containerd kubernetes: + - k8s-seccomp + - k8s-empty-dirs - k8s-limit-range - k8s-expose-ip - k8s-oom From 81b9224d1edf4cbd0aa35b7c576eeb1a9a8eb4d8 Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Wed, 22 Nov 2023 06:37:14 +0000 Subject: [PATCH 3/3] add k8s-empty-dirs test --- .ci/aarch64/configuration_aarch64.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/aarch64/configuration_aarch64.yaml b/.ci/aarch64/configuration_aarch64.yaml index 0612b958d..4d3128546 100644 --- a/.ci/aarch64/configuration_aarch64.yaml +++ b/.ci/aarch64/configuration_aarch64.yaml @@ -13,7 +13,6 @@ test: kubernetes: - k8s-seccomp - - k8s-empty-dirs - k8s-limit-range - k8s-expose-ip - k8s-oom