diskimage-builder/elements/fedora/root.d/10-fedora-cloud-image

#!/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' = "$ARCH" ] ; then
    ARCH="x86_64"
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_RELEASE=${DIB_RELEASE:-20}
    DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud.fedoraproject.org}
    BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-fedora-$DIB_RELEASE.$ARCH.qcow2}
    BASE_IMAGE_TAR=$DIB_RELEASE-Cloud-$ARCH-$DIB_RELEASE.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
New element that uses a fedora cloud image as the base. Change-Id: I7d83bb2b359e7a8c3858eca04c96e35cf4e1fe9e 2013-02-13 22:16:00 +00:00			`#!/bin/bash`

Standarise tracing for scripts There is a wide variety of tracing options through the various shell scripts. Some use "set -eux", others explicity set xtrace and others do nothing. There is a "-x" option to bin/disk-image-create but it doesn't flow down to the many scripts it calls. This adds a global integer variable set by disk-image-create DIB_DEBUG_TRACE. All scripts have a stanza added to detect this and turn on tracing. Any other tracing methods are rolled into this. So the standard header is --- if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then set -x fi set -eu set -o pipefail --- Multiple -x options can be specified to dib-create-image, which increases the value of DIB_DEBUG_TRACE. If script authors feel their script should only trace at higher levels, they should modify the "-gt" value. If they feel it should trace by default, they can modify the default value also. Changes to pachset 16 : scripts which currently trace themselves by default have retained this behaviour with DIB_DEBUG_TRACE defaulting to "1". This was done by running [1] on patch set 15. See the thread beginning at [2] dib-lint is also updated to look for the variable being matched. [1] https://gist.github.com/ianw/71bbda9e6acc74ccd0fd [2] http://lists.openstack.org/pipermail/openstack-dev/2014-November/051575.html Change-Id: I6c5a962260741dcf6f89da9a33b96372a719b7b0 2014-09-04 04:56:29 +00:00			`if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then`
			`set -x`
			`fi`
Update the Fedora element to honour --offline. Similar to the Ubuntu element the Fedora element had not been updated to honour --offline. Also similarly we only check for the existence of the final cached file rather than the image we directly download, because they are generated separately. The -u change is just hygiene to detect future buggy changes. Change-Id: Ib92a9d419bb485c8861da041066827e8d6aac0b7 2013-07-17 22:15:02 +00:00			`set -eu`
set -u and -o pipefail everywhere As with the previous similar changes, this is intended to catch problems as they happen instead of ignoring them and continuing on to potentially fail later. Setting this on all existing scripts will allow us to enforce use via Jenkins. Change-Id: Iad2d490c86dceab148ea9ab08f457c49a5d5352e 2014-04-03 02:24:15 +00:00			`set -o pipefail`
New element that uses a fedora cloud image as the base. Change-Id: I7d83bb2b359e7a8c3858eca04c96e35cf4e1fe9e 2013-02-13 22:16:00 +00:00
			`[ -n "$ARCH" ]`
			`[ -n "$TARGET_ROOT" ]`

			`if [ 'amd64' = "$ARCH" ] ; then`
4 spaces indent ensure 4 spaces indentation is used everywhere. Change-Id: Ieb48faacb4c96b7b358771d70c17f2f22d0354f4 2014-05-02 17:02:38 +00:00			`ARCH="x86_64"`
New element that uses a fedora cloud image as the base. Change-Id: I7d83bb2b359e7a8c3858eca04c96e35cf4e1fe9e 2013-02-13 22:16:00 +00:00			`fi`

Add ability to use local cloud image Adds the ability to set $DIB_LOCAL_IMAGE to use as the base cloud image for a Fedora image build. There are many repetitve tasks that are done every image build. With this change you can build an image with the fedora and vm element and then reuse the resulting image as input to future image builds. This greatly reduces future image build times. For instance 99-up-to-date is already taking almost 2 minutes (even with rpm downloads already cached) for Fedora 20, and is only going to keep taking longer. By having a local up to date Fedora cloud image, this time can be saved on each image build. There is one minor change to support this in that /tmp/grub needs to get cleaned up at the end of image builds so that the image can be reused. Plus, there is no reason for it to stick around anyway. (didn't think this was worth a seperate commit). Change-Id: Ic74d138da922ecc99c38c27f105170d90009a84a 2014-01-21 14:46:06 +00:00			`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_RELEASE=${DIB_RELEASE:-20}`
			`DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud.fedoraproject.org}`
			`BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-fedora-$DIB_RELEASE.$ARCH.qcow2}`
			`BASE_IMAGE_TAR=$DIB_RELEASE-Cloud-$ARCH-$DIB_RELEASE.tgz`
			`IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE`
			`CACHED_IMAGE=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE`

			`fi`

Use redhat-common in fedora element Have the fedora element use the common steps in the redhat-common element. Change-Id: Ic71b11c03b5c3868cc9e82e049f2700c1b67263a 2014-02-18 22:20:14 +00:00			`$TMP_HOOKS_PATH/bin/extract-image $BASE_IMAGE_FILE $BASE_IMAGE_TAR $IMAGE_LOCATION $CACHED_IMAGE`