[releng] ld Cloud_Atomic .composeinfo

[Dennis Gilmore]

commit 43b86ba8dcf8b8a3975d924bc63fc4b83a6a8c87
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Apr 9 16:53:51 2015 -0500

    ld Cloud_Atomic .composeinfo
    
    make sure we do not use $COMPOSE incorrectly in paths
    
    Signed-off-by: Dennis Gilmore <dennis at ausil.us>

 scripts/run-pungi |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/scripts/run-pungi b/scripts/run-pungi
index db3b7c3..4e71903 100755
--- a/scripts/run-pungi
+++ b/scripts/run-pungi
@@ -61,7 +61,7 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/bleed/$basearch/' > fedora-bleed.
  mock -r fedora-branched-compose-x86_64 --install rpm-ostree lorax || exit 1
  mock -r fedora-branched-compose-x86_64  --shell "if [ ! -d $ATOMICDEST ]; then ostree init --repo=$ATOMICDEST --mode=archive-z2;fi"
  mock -r fedora-branched-compose-x86_64 --shell "rpm-ostree compose tree --repo=$ATOMICDEST $ATOMIC/fedora-atomic-docker-host.json" || exit 1
- mock -r fedora-branched-compose-x86_64 --shell "mkdir -p $DESTDIR/$VERSION$COMPOSE/Cloud_Atomic/x86_64/os/ $DESTDIR/$VERSION$COMPOSE/Cloud_Atomic/x86_64/iso"
+ mock -r fedora-branched-compose-x86_64 --shell "mkdir -p $DESTDIR/$VERSION/Cloud_Atomic/x86_64/os/ $DESTDIR/$VERSION/Cloud_Atomic/x86_64/iso"
  mock -r fedora-branched-compose-x86_64 --shell "lorax --nomacboot -p Fedora -v $SHORTVERSION -r $SHORTCOMPOSE \
                                                  -s http://kojipkgs.fedoraproject.org/mash/branched/\$basearch/os/ \
                                                  -s http://kojipkgs.fedoraproject.org/mash/bleed/\$basearch/ \
@@ -76,9 +76,9 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/bleed/$basearch/' > fedora-bleed.
                                                  --add-arch-template /srv/pungi/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl \
                                                  --add-arch-template-var=ostree_osname=Fedora-Cloud_Atomic \
                                                  --add-arch-template-var=ostree_ref=fedora-atomic/f22/x86_64/docker-host \
-                                                 $DESTDIR/$VERSION$COMPOSE/Cloud_Atomic/x86_64/os/ " || exit 1
- mock -r fedora-branched-compose-x86_64 --shell "cp -l $DESTDIR/$VERSION$COMPOSE/Cloud_Atomic/x86_64/os/images/boot.iso $DESTDIR/$VERSION$COMPOSE/Cloud_Atomic/x86_64/iso/Fedora-Cloud_Atomic-x86_64-$VERSION$COMPOSE.iso"
- mock -r fedora-branched-compose-x86_64 --shell "sha256sum -b --tags $DESTDIR/$VERSION$COMPOSE/Cloud_Atomic/x86_64/iso/*iso >$DESTDIR/$VERSION$COMPOSE/Cloud_Atomic/x86_64/iso/Fedora-Cloud_Atomic-$VERSION$COMPOSE-x86_64-CHECKSUM"
+                                                 $DESTDIR/$VERSION/Cloud_Atomic/x86_64/os/ " || exit 1
+ mock -r fedora-branched-compose-x86_64 --shell "cp -l $DESTDIR/$VERSION/Cloud_Atomic/x86_64/os/images/boot.iso $DESTDIR/$VERSION/Cloud_Atomic/x86_64/iso/Fedora-Cloud_Atomic-x86_64-$VERSION.iso"
+ mock -r fedora-branched-compose-x86_64 --shell "sha256sum -b --tags $DESTDIR/$VERSION/Cloud_Atomic/x86_64/iso/*iso >$DESTDIR/$VERSION/Cloud_Atomic/x86_64/iso/Fedora-Cloud_Atomic-$VERSION-x86_64-CHECKSUM"
 
  #mock -r fedora-branched-compose-x86_64 --shell "livemedia-creator " || exit 1
 
@@ -130,6 +130,7 @@ hardlink -vvc $FINALDEST/$VERSION/Workstation $FINALDEST/$VERSION/Server $FINALD
 sg releng "./build_composeinfo $FINALDEST/$VERSION/Workstation"
 sg releng "./build_composeinfo $FINALDEST/$VERSION/Server"
 sg releng "./build_composeinfo $FINALDEST/$VERSION/Cloud"
+sg releng "./build_composeinfo $FINALDEST/$VERSION/Cloud_Atomic"
 
 
 while true