openstack/diskimage-builder
Code Issues Proposed changes

Fix regexp for Fedora element SUBRELEASE parsing

Browse Source 
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
This commit is contained in:
Dmitriy Rabotyagov 2024-06-17 15:21:08 +02:00
parent 55c8644ef3
commit 7cd5268d15
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image
View File

@ -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