From 7cd5268d15d378f41e75b994a5929debfd025139 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 17 Jun 2024 15:21:08 +0200 Subject: [PATCH] Fix regexp for Fedora element SUBRELEASE parsing Current regexp is catching a wrong extra record for HTML-based mirrors [1] Modifying regexp allows to workaround fetching extra string. [1] https://paste.openstack.org/show/bVBUEW88mDF58OKKp3kw/ Change-Id: Ibd8806cad10ad7d993b7953eee2d456e92a8f7cf --- diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image b/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image index ba5da2c61..d401f7015 100755 --- a/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image +++ b/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image @@ -53,7 +53,7 @@ else esac # We have curl write headers to stderr so that we can debug fedora # mirror locations that don't have valid subreleases in their paths. - SUBRELEASE=$(head -1 < <(curl -Lis -D /dev/stderr $DIB_CLOUD_IMAGES/ | grep -o -P '(?<=Fedora-Cloud-Base-'${DIB_RELEASE}'-).*?(?=.'${ARCH}'.qcow2")' | sort -r)) + SUBRELEASE=$(head -1 < <(curl -Lis -D /dev/stderr $DIB_CLOUD_IMAGES/ | grep -o -P '(?<=Fedora-Cloud-Base-'${DIB_RELEASE}'-).*?(?=.'${ARCH}'.qcow2)' | sort -r)) BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-Fedora-Cloud-Base-$DIB_RELEASE-$SUBRELEASE.$ARCH.qcow2} BASE_IMAGE_TAR=Fedora-Cloud-Base-$DIB_RELEASE-$SUBRELEASE.$ARCH.tgz IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE