From 593b62d326347fa8cd51aba052dbcb48699781bc Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Mon, 17 Jul 2023 17:08:26 +0200 Subject: [PATCH 1/2] .gitignore: Ignore ci-cleanup.sh The ci-cleanup file gets created in ci-automation/ to remove any leftovers when a build gets stopped. Since it is in the git tree, git status sees untracked files which is a bit confusing. Ignore the ci-cleanup file. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a62ac41ee1..c0750870e1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ # SDK container env passing helpers sdk_container/.env sdk_container/.sdkenv +ci-cleanup.sh # build cache / artefacts directories __build__/ From 095ab2392e50d65cad07a9add8e84ff852834ff2 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Mon, 17 Jul 2023 17:14:44 +0200 Subject: [PATCH 2/2] 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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci-automation/vms.sh b/ci-automation/vms.sh index 1a64b7fda8..310d1ab0d9 100644 --- a/ci-automation/vms.sh +++ b/ci-automation/vms.sh @@ -102,6 +102,14 @@ 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') + source sdk_lib/sdk_container_common.sh + + 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}"