9f688f53da
With the introduction of centos 8 we have constructs like if [[ $DISTRO =~ (centos|fedora) && $DIB_RELEASE -ge 8 ]] This is intended to match the "centos7" element (from the =~) but it was missed that this is setting the DIB_RELEASE to "GenericCloud". I think it makes more sense for this to be a numeric release, and makes constructs like above work. There really isn't any other type of image to choose here; thus we move it into a new, centos7 specific variable. Note that when the centos 8 images are available, we want to move to a generic "centos" element that will handle both 7 and 8 together (same as rhel) based on DIB_RELEASE and deprecate centos7; this works with that environment too. Change-Id: I2e6b7848070d6452c0563e2a122447627c6e6bf7
43 lines
1.4 KiB
Bash
Executable File
43 lines
1.4 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
[ -n "$ARCH" ]
|
|
[ -n "$TARGET_ROOT" ]
|
|
|
|
if [[ "amd64 x86_64" =~ "$ARCH" ]]; then
|
|
ARCH="x86_64"
|
|
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud.centos.org/centos/7/images}
|
|
elif [[ "arm64 aarch64" =~ "$ARCH" ]]; then
|
|
ARCH="aarch64"
|
|
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud.centos.org/altarch/7/images/aarch64}
|
|
elif [[ "ppc64le" =~ "$ARCH" ]]; then
|
|
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud.centos.org/altarch/7/images/ppc64le}
|
|
else
|
|
echo 'centos7 root element only support the x86_64, aarch64 and ppc64le values for $ARCH'
|
|
exit 1
|
|
fi
|
|
|
|
DIB_LOCAL_IMAGE=${DIB_LOCAL_IMAGE:-}
|
|
|
|
if [ -n "$DIB_LOCAL_IMAGE" ]; then
|
|
IMAGE_LOCATION=$DIB_LOCAL_IMAGE
|
|
# No need to copy a local image into the cache directory, so just specify
|
|
# the cached path as the original path.
|
|
CACHED_IMAGE=$IMAGE_LOCATION
|
|
BASE_IMAGE_FILE=$(basename $DIB_LOCAL_IMAGE)
|
|
BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz
|
|
else
|
|
DIB_CENTOS7_CLOUD_RELEASE=${DIB_CENTOS7_CLOUD_RELEASE:-GenericCloud}
|
|
BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-CentOS-7-${ARCH}-$DIB_CENTOS7_CLOUD_RELEASE.qcow2.xz}
|
|
BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz
|
|
IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE
|
|
CACHED_IMAGE=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE
|
|
fi
|
|
|
|
$TMP_HOOKS_PATH/bin/extract-image $BASE_IMAGE_FILE $BASE_IMAGE_TAR $IMAGE_LOCATION $CACHED_IMAGE
|