Merge "Specify distro release in fedora image name"

This commit is contained in:
Jenkins 2013-10-14 11:51:22 +00:00 committed by Gerrit Code Review
commit a019fcf470

View File

@ -9,10 +9,10 @@ if [ 'amd64' = "$ARCH" ] ; then
ARCH="x86_64" ARCH="x86_64"
fi fi
DIB_RELEASE=${DIB_RELEASE:-latest} DIB_RELEASE=${DIB_RELEASE:-19}
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud.fedoraproject.org} DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud.fedoraproject.org}
BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-fedora-$DIB_RELEASE.$ARCH.qcow2} BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-fedora-$DIB_RELEASE.$ARCH.qcow2}
BASE_IMAGE_TAR=$DIB_RELEASE-Cloud-$ARCH-latest.tgz BASE_IMAGE_TAR=$DIB_RELEASE-Cloud-$ARCH-$DIB_RELEASE.tgz
CACHED_TAR=$DIB_IMAGE_CACHE/$BASE_IMAGE_TAR CACHED_TAR=$DIB_IMAGE_CACHE/$BASE_IMAGE_TAR
if [ -n "$DIB_OFFLINE" -a -f "$CACHED_TAR" ] ; then if [ -n "$DIB_OFFLINE" -a -f "$CACHED_TAR" ] ; then