packaging: Use existing image to build QEMU

Let's first try to pull a pre-existsing image, instead of building our
own, to be used as a builder image for QEMU.

This will save us some CI time.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-01-27 17:31:42 +01:00
parent d0181bb262
commit fb7b86b8e0

View File

@ -39,13 +39,15 @@ CACHE_TIMEOUT=$(date +"%Y-%m-%d")
[ -n "${build_suffix}" ] && HYPERVISOR_NAME="kata-qemu-${build_suffix}" || HYPERVISOR_NAME="kata-qemu" [ -n "${build_suffix}" ] && HYPERVISOR_NAME="kata-qemu-${build_suffix}" || HYPERVISOR_NAME="kata-qemu"
[ -n "${build_suffix}" ] && PKGVERSION="kata-static-${build_suffix}" || PKGVERSION="kata-static" [ -n "${build_suffix}" ] && PKGVERSION="kata-static-${build_suffix}" || PKGVERSION="kata-static"
sudo "${container_engine}" build \ container_image="${BUILDER_REGISTRY}:qemu-$(get_last_modification ${repo_root_dir} ${script_dir})-$(uname -m)"
sudo docker pull ${container_image} || sudo "${container_engine}" build \
--build-arg CACHE_TIMEOUT="${CACHE_TIMEOUT}" \ --build-arg CACHE_TIMEOUT="${CACHE_TIMEOUT}" \
--build-arg http_proxy="${http_proxy}" \ --build-arg http_proxy="${http_proxy}" \
--build-arg https_proxy="${https_proxy}" \ --build-arg https_proxy="${https_proxy}" \
"${packaging_dir}" \ "${packaging_dir}" \
-f "${script_dir}/Dockerfile" \ -f "${script_dir}/Dockerfile" \
-t qemu-static -t "${container_image}"
sudo "${container_engine}" run \ sudo "${container_engine}" run \
--rm \ --rm \
@ -59,7 +61,7 @@ sudo "${container_engine}" run \
--env QEMU_TARBALL="${qemu_tar}" \ --env QEMU_TARBALL="${qemu_tar}" \
--env PREFIX="${prefix}" \ --env PREFIX="${prefix}" \
-v "${repo_root_dir}:/root/kata-containers" \ -v "${repo_root_dir}:/root/kata-containers" \
-v "${PWD}":/share qemu-static \ -v "${PWD}":/share "${container_image}" \
bash -c "/root/kata-containers/tools/packaging/static-build/qemu/build-qemu.sh" bash -c "/root/kata-containers/tools/packaging/static-build/qemu/build-qemu.sh"
sudo chown ${USER}:$(id -gn ${USER}) "${PWD}/${qemu_tar}" sudo chown ${USER}:$(id -gn ${USER}) "${PWD}/${qemu_tar}"