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

Commit 54ba9d7

Browse files
committed
correct tarball build directory
Depends-on: github.com/kata-containers/kata-containers#8430
1 parent b1c8cdd commit 54ba9d7

6 files changed

Lines changed: 18 additions & 6 deletions

File tree

.ci/aarch64/configuration_aarch64.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ test:
1212
- cri-containerd
1313

1414
kubernetes:
15-
- k8s-cpu-ns
1615
- k8s-limit-range
17-
- k8s-number-cpus
1816
- k8s-expose-ip
1917
- k8s-oom
2018
- k8s-block-volume

.ci/aarch64/install_rom_aarch64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ build_uefi()
5555
git clone "${EDK2_PLAT_REPO}"
5656
git clone -b "${ACPICA_TAG_ID}" "${ACPICA}"
5757

58-
sudo apt install -y python python3 python3-distutils uuid-dev build-essential bison flex
58+
sudo apt install -y python3 python3-distutils uuid-dev build-essential bison flex
5959

6060
mkdir toolchain
6161
pushd toolchain/

.ci/install_kata_kernel.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ main() {
7777
experimental)
7878
build_and_install_kernel "kernel-experimental"
7979
;;
80+
arm-experimental)
81+
build_and_install_kernel "kernel-arm-experimental"
82+
;;
8083
vanilla)
8184
build_and_install_kernel "kernel"
8285
;;

.ci/install_qemu.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,16 @@ main() {
9090
vanilla)
9191
qemu_type="qemu"
9292
;;
93+
arm-experimental)
94+
qemu_type="qemu-arm-experimental"
95+
;;
9396
*)
9497
die_unsupported_qemu_type "$qemu_type"
9598
;;
9699
esac
97100

98101
case ${QEMU_ARCH} in
99-
"aarch64"|"ppc64le")
102+
"ppc64le")
100103
# We're still no there for using the kata-deploy
101104
# scripts with ppc64le and aarch64.
102105
CURRENT_QEMU_VERSION=$(get_version "assets.hypervisor.qemu.version")
@@ -110,8 +113,13 @@ main() {
110113

111114
build_and_install_qemu
112115
;;
113-
"x86_64"|"s390x")
116+
"aarch64"|"x86_64"|"s390x")
114117
build_static_artifact_and_install "${qemu_type}"
118+
# Install UEFI ROM for qemu
119+
ENABLE_ARM64_UEFI="${ENABLE_ARM64_UEFI:-true}"
120+
[ "${ENABLE_ARM64_UEFI}" == "true" ] && ${cidir}/aarch64/install_rom_aarch64.sh
121+
sudo rm -f /opt/kata/bin/qemu-system-aarch64
122+
sudo ln -s /opt/kata/bin/qemu-system-aarch64-arm-experimental /opt/kata/bin/qemu-system-aarch64
115123
;;
116124
*)
117125
die "Architecture ${QEMU_ARCH} not supported"

.ci/lib.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,9 @@ function build_static_artifact_and_install() {
173173

174174
clone_katacontainers_repo
175175

176-
pushd "$katacontainers_repo_dir" >/dev/null
176+
pushd "$katacontainers_repo_dir/tools/packaging/kata-deploy/local-build" >/dev/null
177177
sudo -E PATH=$PATH make "$make_target"
178+
pwd
178179
sudo tar -xvJpf "build/${tarball}" -C "${destdir}"
179180
sudo rm -rf "build/"
180181
popd >/dev/null

.ci/run.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ case "${CI_JOB}" in
6666
echo "INFO: Running Confidential Container tests"
6767
sudo -E PATH="$PATH" CRI_RUNTIME="containerd" bash -c "make cc-containerd"
6868
fi
69+
echo "INFO: Running kubernetes tests"
70+
sudo -E PATH="$PATH" CRI_RUNTIME="containerd" bash -c "make kubernetes"
6971
echo "INFO: Running runk test"
7072
sudo -E PATH="$PATH" CRI_RUNTIME="containerd" bash -c "make runk"
7173
;;

0 commit comments

Comments
 (0)