[releng] move the cloud image structure to match that of the other deliverables

[Dennis Gilmore]

commit c102ca77bb9c2208c0bc991a66d8a9e236cfb40c
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Feb 27 14:38:42 2015 -0600

    move the cloud image structure to match that of the other deliverables

 scripts/run-pungi |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/scripts/run-pungi b/scripts/run-pungi
index d9276a0..316431e 100755
--- a/scripts/run-pungi
+++ b/scripts/run-pungi
@@ -114,17 +114,17 @@ done
 
 
 pushd $FINALDEST/$VERSION/
-sg releng "mkdir -p Images/armhfp Cloud-Images/Images/i386 Cloud-Images/Images/x86_64 Spins/i386 Spins/x86_64 Live/i386 Server/armhfp/Images Live/x86_64 Docker/x86_64 Workstation/armhfp/Images Workstation/x86_64/iso Workstation/i386/iso"
+sg releng "mkdir -p Images/armhfp Cloud-Images/i386/Images Cloud-Images/x86_64/Images Spins/i386 Spins/x86_64 Live/i386 Server/armhfp/Images 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/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-Cloud*$DATE-$VERSION\.i386.raw.xz $FINALDEST/$VERSION/Cloud-Images/i386/Images/"
+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/Images/"
+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/Images/"
+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/Images/"
 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/"
@@ -153,8 +153,8 @@ for arch in i386 x86_64; do pushd $arch; sg releng "sha256sum --tag -b *iso>  Fe
 popd
 done
 
-pushd $FINALDEST/$VERSION/Cloud-Images/Images
-for arch in i386 x86_64; do pushd $arch; sg releng "sha256sum --tag -b *qcow2 *raw.xz>  Fedora-Cloud-Images-$arch-$VERSION-CHECKSUM"; popd; done
+pushd $FINALDEST/$VERSION/Cloud-Images
+for arch in i386 x86_64; do pushd $arch/Images; sg releng "sha256sum --tag -b *qcow2 *raw.xz>  Fedora-Cloud-Images-$arch-$VERSION-CHECKSUM"; popd; done
 popd
 
 pushd $FINALDEST/$VERSION/Workstation/armhfp/Images