[releng] segregate the Cloud images and install trees

[Dennis Gilmore]

commit d8ac8aa3e589008b768b4bda44d20a0b4234e5a2
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Wed Feb 18 15:22:50 2015 -0600

    segregate the Cloud images and install trees

 scripts/run-pungi |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/scripts/run-pungi b/scripts/run-pungi
index 7acffa0..dae7546 100755
--- a/scripts/run-pungi
+++ b/scripts/run-pungi
@@ -113,17 +113,17 @@ done
 
 
 pushd $FINALDEST/$VERSION/
-sg releng "mkdir -p Images/armhfp Cloud/Images/i386 Cloud/Images/x86_64 Spins/i386 Spins/x86_64 Live/i386 Live/x86_64 Docker/x86_64 Workstation/armhfp/Images/ Workstation/x86_64/iso Workstation/i386/iso"
+sg releng "mkdir -p Images/armhfp Cloud-Images/Images/i386 Cloud-Images/Images/x86_64 Spins/i386 Spins/x86_64 Live/i386 Live/x86_64 Docker/x86_64 Workstation/armhfp/Images/ Workstation/x86_64/iso Workstation/i386/iso"
 popd
 
 
 USER=$(whoami)
 # stage images
 sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora*armhfp-$SHORTVERSION-$SHORTCOMPOSE-sda.raw.xz $FINALDEST/$VERSION/Images/armhfp/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.i386.raw.xz $FINALDEST/$VERSION/Cloud/Images/i386/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.i386.qcow2 $FINALDEST/$VERSION/Cloud/Images/i386/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.x86_64.raw.xz $FINALDEST/$VERSION/Cloud/Images/x86_64/"
-sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.x86_64.qcow2 $FINALDEST/$VERSION/Cloud/Images/x86_64/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.i386.raw.xz $FINALDEST/$VERSION/Cloud-Images/Images/i386/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.i386.qcow2 $FINALDEST/$VERSION/Cloud-Images/Images/i386/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.x86_64.raw.xz $FINALDEST/$VERSION/Cloud-Images/Images/x86_64/"
+sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Cloud*$DATE-$VERSION\.x86_64.qcow2 $FINALDEST/$VERSION/Cloud-Images/Images/x86_64/"
 sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task_*/Fedora-Docker*-$DATE-$VERSION*tar.gz $FINALDEST/$VERSION/Docker/x86_64/"
 
 sg releng "sudo /usr/bin/cp -l /mnt/fedora_koji/koji/scratch/$USER/task*/*i686*$SHORTVERSION-$SHORTCOMPOSE.iso $FINALDEST/$VERSION/Spins/i386/"
@@ -151,7 +151,7 @@ for arch in i386 x86_64; do pushd $arch; sg releng "sha256sum -b *iso>  Fedora-$
 popd
 done
 
-pushd $FINALDEST/$VERSION/Cloud/Images
+pushd $FINALDEST/$VERSION/Cloud-Images/Images
 for arch in i386 x86_64; do pushd $arch; sg releng "sha256sum -b *qcow2 *raw.xz>  Fedora-Cloud-Images-$arch-$VERSION-CHECKSUM"; popd; done
 popd
 
@@ -174,7 +174,7 @@ popd
 # stage the composed tree to final locateion
 sg releng "mkdir /pub/alt/stage/$VERSION$COMPOSE/"
 sg releng "chmod 700 /pub/alt/stage/$VERSION$COMPOSE/"
-for type in Docker Workstation Server Cloud Spins Live Images; do sg releng "rsync -avhH $FINALDEST/$VERSION/$type/ /pub/alt/stage/$VERSION$COMPOSE/$type/"; done
+for type in Docker Workstation Server Cloud Cloud-Images Spins Live Images; do sg releng "rsync -avhH $FINALDEST/$VERSION/$type/ /pub/alt/stage/$VERSION$COMPOSE/$type/"; done
 #sg releng "chmod 755 /pub/alt/stage/$VERSION$COMPOSE/"
 
 echo "======= compose output for trac ======="