openstack/diskimage-builder
Code Issues Proposed changes

Allow to override Fedora subrelease regexp

Browse Source 
This gives more flexability into defenition and won't result in users to
be blocked until new DIB release will happen with fixed regexp.

Change-Id: I5b6d15dc7cbc6f41b600c5b33f5030df5bdfa793
This commit is contained in:
Dmitriy Rabotyagov 2024-06-17 15:25:06 +02:00
parent 7cd5268d15
commit 01a4ab7724
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,8 @@ else
esac esac
# We have curl write headers to stderr so that we can debug fedora # We have curl write headers to stderr so that we can debug fedora
# mirror locations that don't have valid subreleases in their paths. # 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_REGEXP=${SUBRELEASE_REGEXP:-'(?<=Fedora-Cloud-Base-'${DIB_RELEASE}'-).*?(?=.'${ARCH}'.qcow2)'}
SUBRELEASE=$(head -1 < <(curl -Lis -D /dev/stderr $DIB_CLOUD_IMAGES/ | grep -o -P $SUBRELEASE_REGEXP | sort -r))
BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-Fedora-Cloud-Base-$DIB_RELEASE-$SUBRELEASE.$ARCH.qcow2} 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 BASE_IMAGE_TAR=Fedora-Cloud-Base-$DIB_RELEASE-$SUBRELEASE.$ARCH.tgz
IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE