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

Commit c522594

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

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.ci/install_kata_kernel.sh

+3
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

+5-2
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,7 +113,7 @@ 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}"
115118
;;
116119
*)

.ci/lib.sh

+2-1
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

0 commit comments

Comments
 (0)