From d2a2a5eada825372a5116ee6c86cd311c8ec6a51 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Mon, 17 Jul 2023 17:14:44 +0200 Subject: [PATCH] ci-automation/vms: Export official release variable The official release variable is used to decide whether a build ID gets appended to the FLATCAR_VERSION (or VERSION in os-release) or not. It was set for the image job but not for the vms job, causing the build_sysext script to get the build ID appended to the FLATCAR_VERSION which causes a mismatch with the one from the image job. Set the official release variable in the vms job as well. --- ci-automation/vms.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci-automation/vms.sh b/ci-automation/vms.sh index 1a64b7fda84..bc39eb7b40a 100644 --- a/ci-automation/vms.sh +++ b/ci-automation/vms.sh @@ -62,6 +62,7 @@ function _vm_build_impl() { shift # $@ now contains image formats to build + source sdk_lib/sdk_container_common.sh source ci-automation/ci_automation_common.sh source ci-automation/gpg_setup.sh @@ -102,6 +103,12 @@ function _vm_build_impl() { # Keep compatibility with SDK scripts where "equinix_metal" remains unknown. formats=$(echo "$formats" | tr ' ' '\n' | sed 's/equinix_metal/packet/g') + if is_official "${vernum}"; then + export COREOS_OFFICIAL=1 + else + export COREOS_OFFICIAL=0 + fi + local images_in="images-in/" local file rm -rf "${images_in}"