[releng] adjust the url based on if its a nightly compose or TC/RC one

[Dennis Gilmore]

commit 46a1fd5667b93bd936dd28e591f14578c8e213cd
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Oct 30 02:17:41 2014 -0500

    adjust the url based on if its a nightly compose or TC/RC one

 scripts/build-cloud-images |    9 ++++++---
 scripts/buildbranched      |    2 +-
 scripts/buildrawhide       |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/scripts/build-cloud-images b/scripts/build-cloud-images
index 01b6bc5..1a9582b 100755
--- a/scripts/build-cloud-images
+++ b/scripts/build-cloud-images
@@ -22,11 +22,16 @@ TARGET=f$VERSION-candidate
 BRANCH=branched
 fi
 
+if [ "$COMPOSE" == "nightly" ]; then
+    url=http://kojipkgs.fedoraproject.org/mash/$BRANCH-$BUILD/$VERSION/\$arch/os/
+else
+    url=http://compose-x86-02.phx2.fedoraproject.org/compose/$VERSION$COMPOSE/$VERSION/Cloud/\$arch/os/
+fi
+
 for spin in Base
 do
     declare -l lspin
     lspin=$spin
-    url=http://compose-x86-02.phx2.fedoraproject.org/compose/$VERSION$COMPOSE/$VERSION/Cloud/\$arch/os/
     kickstart=fedora-cloud-$lspin-$GITHASH.ks
     ksflatten -c fedora-cloud-$lspin.ks -o $kickstart >& /dev/null
     echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >> $kickstart
@@ -38,7 +43,6 @@ for spin in Atomic
 do
     declare -l lspin
     lspin=$spin
-    url=http://compose-x86-02.phx2.fedoraproject.org/compose/$VERSION$COMPOSE/$VERSION/Cloud/\$arch/os/
     kickstart=fedora-cloud-$lspin-$GITHASH.ks
     ksflatten -c fedora-cloud-$lspin.ks -o $kickstart >& /dev/null
     echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >> $kickstart
@@ -50,7 +54,6 @@ for spin in Base
 do
     declare -l lspin
     lspin=$spin
-    url=http://compose-x86-02.phx2.fedoraproject.org/compose/$VERSION$COMPOSE/$VERSION/Cloud/\$arch/os/
     kickstart=fedora-docker-$lspin-$GITHASH.ks
     ksflatten -c fedora-docker-$lspin.ks -o $kickstart >& /dev/null
     echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >> $kickstart
diff --git a/scripts/buildbranched b/scripts/buildbranched
index fd6ef49..d34b3e6 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -214,7 +214,7 @@ log "finished checking out spin-kickstarts"
 log "started building live/arm/cloud images"
 ../releng/scripts/build-livecds $BRANCHED $DATE $BRANCHED
 ../releng/scripts/build-arm-images $BRANCHED $DATE $BRANCHED
-../releng/scripts/build-cloud-images $BRANCHED $DATE $BRANCHED
+../releng/scripts/build-cloud-images $BRANCHED $DATE $BRANCHED nightly
 log "finished starting building live/arm/cloud images"
 popd
 popd
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index 31c789f..0ab6ad3 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -206,7 +206,7 @@ log "finished checking out spin-kickstarts"
 log "started building live/arm/cloud images"
 ../releng/scripts/build-livecds $BRANCHED $DATE $BRANCHED
 ../releng/scripts/build-arm-images $BRANCHED $DATE $BRANCHED
-../releng/scripts/build-cloud-images $BRANCHED $DATE $BRANCHED
+../releng/scripts/build-cloud-images $BRANCHED $DATE $BRANCHED nightly
 log "finished starting building live/arm/cloud images"
 popd
 popd