commit c5abb4b88a2fcd097c322a4cfd488338ed1a1495
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Mar 9 00:54:39 2015 -0500
setuo to be able to build updates cloud images
scripts/build-cloud-images | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/scripts/build-cloud-images b/scripts/build-cloud-images
index 7f0e0d9..13a5362 100755
--- a/scripts/build-cloud-images
+++ b/scripts/build-cloud-images
@@ -26,9 +26,16 @@ fi
if [ "$COMPOSE" == "nightly" ]; then
url=http://kojipkgs.fedoraproject.org/mash/$BRANCH-$BUILD/$VERSION/\$arch...
atomicurl=http://kojipkgs.fedoraproject.org/mash/atomic/$VERSION/
+ REPOS="--repo=$url"
+elif [ "$COMPOSE" == "updates" ]; then
+
url=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$VE...
+
updatesurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updat...
+
atomicurl=http://kojipkgs.fedoraproject.org/mash/atomic/$VERSION/
+ REPOS="--repo=$url --repo=$updatesurl"
else
url=http://compose-x86-02.phx2.fedoraproject.org/compose/$RELEASE$COMPOSE...
atomicurl=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/
+ REPOS="--repo=$url"
fi
for spin in Base
@@ -39,7 +46,7 @@ do
ksflatten -c fedora-cloud-$lspin.ks -o $kickstart
echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >>
$kickstart
#koji image-build fedora-cloud-$spin $VERSION --distro Fedora-20 $TARGET
--ksurl=git://git.fedorahosted.org/git/spin-kickstarts.git?#$GITHASH
--kickstart=fedora-cloud-$lspin.ks $url x86_64 i386 --format=qcow2 --format=raw
--release=$VERSION --scratch --repo=$url --nowait --disk-size=3
- koji image-build Fedora-Cloud-$spin $RELEASE --distro Fedora-20 $TARGET
--kickstart=fedora-cloud-$lspin-$GITHASH.ks $url x86_64 i386 --format=qcow2
--format=raw-xz --release=$BUILD --scratch --repo=$url --nowait --disk-size=3
+ koji image-build Fedora-Cloud-$spin $RELEASE --distro Fedora-20 $TARGET
--kickstart=fedora-cloud-$lspin-$GITHASH.ks $url x86_64 i386 --format=qcow2
--format=raw-xz --release=$BUILD --scratch $REPOS --nowait --disk-size=3
done
for spin in Atomic
@@ -65,7 +72,7 @@ do
sed -i -e
"s|--url=\"http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/\"|--url=\"$atomicurl\"|g"
$kickstart
koji image-build Fedora-Cloud-$spin $RELEASE $TARGET $url x86_64 \
- --repo=$url \
+ $REPOS \
--release=$BUILD \
--distro Fedora-20 \
--kickstart=fedora-cloud-$lspin-$GITHASH.ks \
@@ -89,5 +96,5 @@ do
ksflatten -c fedora-docker-$lspin.ks -o $kickstart
echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >>
$kickstart
#koji image-build fedora-cloud-$spin $VERSION --distro Fedora-20 $TARGET
--ksurl=git://git.fedorahosted.org/git/spin-kickstarts.git?#$GITHASH
--kickstart=fedora-cloud-$lspin.ks $url x86_64 i386 --format=qcow2 --format=raw
--release=$VERSION --scratch --repo=$url --nowait --disk-size=3
- koji image-build Fedora-Docker-$spin $RELEASE --distro Fedora-20 $TARGET
--kickstart=fedora-docker-$lspin-$GITHASH.ks $url x86_64 --format=docker --release=$BUILD
--scratch --repo=$url --nowait --disk-size=3
+ koji image-build Fedora-Docker-$spin $RELEASE --distro Fedora-20 $TARGET
--kickstart=fedora-docker-$lspin-$GITHASH.ks $url x86_64 --format=docker --release=$BUILD
--scratch $REPOS --nowait --disk-size=3
done