Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

DON'T MERGE: test vcpu hotplug on arm64 #5794

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .ci/aarch64/configuration_aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ test:
- cri-containerd

kubernetes:
- k8s-cpu-ns
- k8s-seccomp
- k8s-limit-range
- k8s-number-cpus
- k8s-expose-ip
- k8s-oom
- k8s-block-volume
Expand Down
2 changes: 1 addition & 1 deletion .ci/aarch64/install_rom_aarch64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
3 changes: 3 additions & 0 deletions .ci/install_kata_kernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand Down
12 changes: 10 additions & 2 deletions .ci/install_qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion .ci/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand Down
Loading