From 987cc3fd75b16d6966e6b81f16a7bf19e10c5ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C5=A1a=20Tomi=C4=87?= Date: Thu, 16 Nov 2023 17:16:08 +0000 Subject: [PATCH] feat(ci): repro-check.sh - use HostOS .zst image instead of .gz --- gitlab-ci/tools/repro-check.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gitlab-ci/tools/repro-check.sh b/gitlab-ci/tools/repro-check.sh index 978961a3a08..f8fe6b7a639 100755 --- a/gitlab-ci/tools/repro-check.sh +++ b/gitlab-ci/tools/repro-check.sh @@ -268,6 +268,11 @@ download_ci_files() { local os_url="${BASE_URL}/${os_type}/update-img/update-img.tar.gz" local sha_url="${BASE_URL}/${os_type}/update-img/SHA256SUMS" + if [ "$os_type" == "host-os" ]; then + os_url="${BASE_URL}/${os_type}/update-img/update-img.tar.zst" + sha_url="${BASE_URL}/${os_type}/update-img/SHA256SUMS" + fi + if [ "$os_type" == "setup-os" ]; then os_url="${BASE_URL}/${os_type}/disk-img/disk-img.tar.gz" sha_url="${BASE_URL}/${os_type}/disk-img/SHA256SUMS" @@ -304,7 +309,7 @@ check_ci_hash() { log "Validating that uploaded image hashes match the provided proposal hashes" check_ci_hash "guestos" "update-img.tar.gz" "ci_package_guestos_sha256_hex" -check_ci_hash "hostos" "update-img.tar.gz" "ci_package_hostos_sha256_hex" +check_ci_hash "hostos" "update-img.tar.zst" "ci_package_hostos_sha256_hex" check_ci_hash "setupos" "disk-img.tar.gz" "ci_package_setupos_sha256_hex" log_success "The CI's artifacts and hash match" @@ -351,7 +356,7 @@ log "Build IC-OS" log_success "Built IC-OS successfully" mv artifacts/icos/guestos/update-img.tar.gz "$dev_out/guestos" -mv artifacts/icos/hostos/update-img.tar.gz "$dev_out/hostos" +mv artifacts/icos/hostos/update-img.tar.zst "$dev_out/hostos" mv artifacts/icos/setupos/disk-img.tar.gz "$dev_out/setupos" compute_dev_hash() { @@ -367,7 +372,7 @@ compute_dev_hash() { } compute_dev_hash "guestos" "update-img.tar.gz" "dev_package_guestos_sha256_hex" -compute_dev_hash "hostos" "update-img.tar.gz" "dev_package_hostos_sha256_hex" +compute_dev_hash "hostos" "update-img.tar.zst" "dev_package_hostos_sha256_hex" compute_dev_hash "setupos" "disk-img.tar.gz" "dev_package_setupos_sha256_hex" compare_hashes() {