[releng] tweak up things so that we use better values for version and release

[Dennis Gilmore]

commit f400953236ccafa4ca41b6f5ef6967caa41c8515
Author: Dennis Gilmore <dennis(a)ausil.us&gt;
Date:   Sun Mar 1 21:24:12 2015 -0600

    tweak up things so that we use better values for version and release

 scripts/build-cloud-images |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/scripts/build-cloud-images b/scripts/build-cloud-images
index f334060..be0009e 100755
--- a/scripts/build-cloud-images
+++ b/scripts/build-cloud-images
@@ -24,7 +24,7 @@ BRANCH=branched
 fi
 
 if [ "$COMPOSE" == "nightly" ]; then
-    url=http://kojipkgs.fedoraproject.org/mash/$BRANCH-$BUILD/$VERSION/\$arch...
+    url=http://kojipkgs.fedoraproject.org/mash/$BRANCH-$RELEASE/$VERSION/\$ar...
     atomicurl=http://kojipkgs.fedoraproject.org/mash/atomic/$VERSION/
 else
    
url=http://compose-x86-02.phx2.fedoraproject.org/compose/$RELEASE$COMPOSE...
@@ -39,7 +39,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 $BUILD --distro Fedora-20 $TARGET 
--kickstart=fedora-cloud-$lspin-$GITHASH.ks $url x86_64 i386 --format=qcow2
--format=raw-xz --release=$RELEASE --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
 done
 
 for spin in Atomic
@@ -52,7 +52,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 $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 $BUILD --distro Fedora-20 $TARGET 
--kickstart=fedora-cloud-$lspin-$GITHASH.ks $url x86_64 --format=qcow2 --format=raw-xz
--release=$RELEASE --scratch --repo=$url --nowait --disk-size=6
+    koji image-build Fedora-Cloud-$spin $RELEASE --distro Fedora-20 $TARGET 
--kickstart=fedora-cloud-$lspin-$GITHASH.ks $url x86_64 --format=qcow2 --format=raw-xz
--release=$BUILD --scratch --repo=$url --nowait --disk-size=6
 done
 
 for spin in Atomic-Vagrant
@@ -64,9 +64,9 @@ do
     echo "url --url=$url"|sed -e 's|$arch|$basearch|g' >>
$kickstart
     sed -i -e
"s|--url=\"http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/\"|--url=\"$atomicurl\"|g"
$kickstart
 
-    koji image-build Fedora-Cloud-$spin $BUILD $TARGET $url x86_64 \
+    koji image-build Fedora-Cloud-$spin $RELEASE $TARGET $url x86_64 \
          --repo=$url \
-         --release=$RELEASE \
+         --release=$BUILD \
          --distro Fedora-20 \
          --kickstart=fedora-cloud-$lspin-$GITHASH.ks \
          --format=qcow2 --format=raw-xz \
@@ -89,5 +89,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 $BUILD --distro Fedora-20 $TARGET 
--kickstart=fedora-docker-$lspin-$GITHASH.ks $url x86_64  --format=docker
--release=$RELEASE --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
 done