mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-12 05:12:37 +00:00
local-build: Use cached RootFS when possible
As we've added the support for caching components, let's use them whenever those are available. Fixes: #6480 Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com> Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
This commit is contained in:
parent
09ce4ab893
commit
1b8c5474da
@ -120,12 +120,52 @@ install_cached_tarball_component() {
|
|||||||
|
|
||||||
#Install guest image
|
#Install guest image
|
||||||
install_image() {
|
install_image() {
|
||||||
|
local jenkins="${jenkins_url}/job/kata-containers-main-rootfs-image-$(uname -m)/${cached_artifacts_path}"
|
||||||
|
local component="rootfs-image"
|
||||||
|
|
||||||
|
local osbuilder_last_commit="$(get_last_modification "${repo_root_dir}/tools/osbuilder")"
|
||||||
|
local guest_image_last_commit="$(get_last_modification "${repo_root_dir}/tools/packaging/guest-image")"
|
||||||
|
local agent_last_commit="$(get_last_modification "${repo_root_dir}/src/agent")"
|
||||||
|
local libs_last_commit="$(get_last_modification "${repo_root_dir}/src/libs")"
|
||||||
|
local gperf_version="$(get_from_kata_deps "externals.gperf.version")"
|
||||||
|
local libseccomp_version="$(get_from_kata_deps "externals.libseccomp.version")"
|
||||||
|
local rust_version="$(get_from_kata_deps "languages.rust.meta.newest-version")"
|
||||||
|
|
||||||
|
install_cached_tarball_component \
|
||||||
|
"${component}" \
|
||||||
|
"${jenkins}" \
|
||||||
|
"${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${gperf_version}-${libseccomp_version}-${rust_version}-image" \
|
||||||
|
"" \
|
||||||
|
"${final_tarball_name}" \
|
||||||
|
"${final_tarball_path}" \
|
||||||
|
&& return 0
|
||||||
|
|
||||||
info "Create image"
|
info "Create image"
|
||||||
"${rootfs_builder}" --imagetype=image --prefix="${prefix}" --destdir="${destdir}"
|
"${rootfs_builder}" --imagetype=image --prefix="${prefix}" --destdir="${destdir}"
|
||||||
}
|
}
|
||||||
|
|
||||||
#Install guest initrd
|
#Install guest initrd
|
||||||
install_initrd() {
|
install_initrd() {
|
||||||
|
local jenkins="${jenkins_url}/job/kata-containers-main-rootfs-initrd-$(uname -m)/${cached_artifacts_path}"
|
||||||
|
local component="rootfs-initrd"
|
||||||
|
|
||||||
|
local osbuilder_last_commit="$(get_last_modification "${repo_root_dir}/tools/osbuilder")"
|
||||||
|
local guest_image_last_commit="$(get_last_modification "${repo_root_dir}/tools/packaging/guest-image")"
|
||||||
|
local agent_last_commit="$(get_last_modification "${repo_root_dir}/src/agent")"
|
||||||
|
local libs_last_commit="$(get_last_modification "${repo_root_dir}/src/libs")"
|
||||||
|
local gperf_version="$(get_from_kata_deps "externals.gperf.version")"
|
||||||
|
local libseccomp_version="$(get_from_kata_deps "externals.libseccomp.version")"
|
||||||
|
local rust_version="$(get_from_kata_deps "languages.rust.meta.newest-version")"
|
||||||
|
|
||||||
|
install_cached_tarball_component \
|
||||||
|
"${component}" \
|
||||||
|
"${jenkins}" \
|
||||||
|
"${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${gperf_version}-${libseccomp_version}-${rust_version}-initrd" \
|
||||||
|
"" \
|
||||||
|
"${final_tarball_name}" \
|
||||||
|
"${final_tarball_path}" \
|
||||||
|
&& return 0
|
||||||
|
|
||||||
info "Create initrd"
|
info "Create initrd"
|
||||||
"${rootfs_builder}" --imagetype=initrd --prefix="${prefix}" --destdir="${destdir}"
|
"${rootfs_builder}" --imagetype=initrd --prefix="${prefix}" --destdir="${destdir}"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user