From bda73d4de3f91a6171c26d3188b5eb0ee689485e Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 20 Dec 2024 16:21:12 +0000 Subject: [PATCH] ci-automation: Give the sbsign_image container a name Otherwise it uses the default name, which can clash with other concurrent jobs, especially jobs for the other arches. Signed-off-by: James Le Cuirot --- ci-automation/sbsign_image.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci-automation/sbsign_image.sh b/ci-automation/sbsign_image.sh index fe3053e7fd..361401b40e 100644 --- a/ci-automation/sbsign_image.sh +++ b/ci-automation/sbsign_image.sh @@ -82,7 +82,9 @@ function _sbsign_image_impl() { local sdk_image="$(docker_image_fullname "${sdk_name}" "${docker_sdk_vernum}")" echo "docker image rm -f '${sdk_image}'" >> ./ci-cleanup.sh - ./run_sdk_container -x ./ci-cleanup.sh -v "${FLATCAR_VERSION}" -U -C "${sdk_image}" \ + local docker_vernum="$(vernum_to_docker_image_version "${FLATCAR_VERSION}")" + local sbsign_container="flatcar-sbsign-image-${arch}-${docker_vernum}" + ./run_sdk_container -x ./ci-cleanup.sh -n "${sbsign_container}" -v "${FLATCAR_VERSION}" -U -C "${sdk_image}" \ ./sbsign_image --board="${arch}-usr" \ --group="${channel}" --version="${FLATCAR_VERSION}" \ --output_root="${CONTAINER_IMAGE_ROOT}" \