From c3ae1ce3b05906ff7913ee2451a2896dd03f854b Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Wed, 9 Mar 2022 18:19:52 +0100 Subject: [PATCH] ci-automation: set images as official based on version The image needs to be set into official mode through a helper script (see jenkins/images.sh) and the COREOS_OFFICIAL variable needs to be set for prod_image_util.sh/build_image_util.sh/grub_install.sh. --- ci-automation/image.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ci-automation/image.sh b/ci-automation/image.sh index 8926710f94..87ac8ca65e 100644 --- a/ci-automation/image.sh +++ b/ci-automation/image.sh @@ -55,10 +55,22 @@ function image_build() { local image="flatcar-images-${arch}" local image_container="${image}-${docker_vernum}" + local official_arg="" + if is_official "${vernum}"; then + export COREOS_OFFICIAL=1 + official_arg="--official" + else + export COREOS_OFFICIAL=0 + official_arg="--noofficial" + fi + # build image and store it in the container ./run_sdk_container -x ./ci-cleanup.sh -n "${image_container}" -C "${packages_image}" \ -v "${vernum}" \ mkdir -p "${CONTAINER_IMAGE_ROOT}" + ./run_sdk_container -n "${image_container}" -C "${packages_image}" \ + -v "${vernum}" \ + ./set_official --board="${arch}-usr" "${official_arg}" ./run_sdk_container -n "${image_container}" -C "${packages_image}" \ -v "${vernum}" \ ./build_image --board="${arch}-usr" --group="${channel}" \