From 9252e2525c114658622f98a38890046c6ed68f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Fri, 19 Jan 2024 17:39:40 +0100 Subject: [PATCH] Test/azure.sh: don't use dot-notation for image name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using the DISTRO_CODE with dot to separate major and minor version is breaking cloud-image-val testing. Specifically, the tool is using regular expression to search for an uploaded image, but the expression is not expecting any dot in the version. This will be fixed in [1], but merging it will take some time due to CIV CI being currently broken. Due to this, workaround the problem for now by making sure that the TEST_ID, which is used to construct the IMAGE_NAME, does not contain any dot in the DISTRO_CODE. [1] https://github.com/osbuild/cloud-image-val/pull/290 Signed-off-by: Tomáš Hozza --- test/cases/azure.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/cases/azure.sh b/test/cases/azure.sh index eb12a0efa..c6e186c6f 100755 --- a/test/cases/azure.sh +++ b/test/cases/azure.sh @@ -60,7 +60,9 @@ fi az version ARCH=$(uname -m) -TEST_ID="$DISTRO_CODE-$ARCH-$BRANCH_NAME-$BUILD_ID" +# Remove the potential dot from the DISTRO_CODE to workaround cloud-image-val limitation +# TODO: remove once https://github.com/osbuild/cloud-image-val/pull/290 is merged +TEST_ID="${DISTRO_CODE//./}-$ARCH-$BRANCH_NAME-$BUILD_ID" IMAGE_KEY=image-${TEST_ID} ARTIFACTS="${ARTIFACTS:-/tmp/artifacts}"