[releng] setup and rsync teh atomic trees

[Dennis Gilmore]

commit 41e35f84be214d90d805f47449b0e7d26693f859
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Nov 13 16:50:25 2014 -0600

    setup and rsync teh atomic trees

 scripts/build-functions.sh |    6 ++++--
 scripts/buildbranched      |    3 ++-
 scripts/buildrawhide       |    3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index b245c27..b54e225 100644
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -141,10 +141,10 @@ log "starting atomic tree creation"
 MOCKCONFIG="fedora-${DIST}-compose-x86_64"
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --init
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --install rpm-ostree git
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "if [ ! -d $ATOMICDEST ]; then ostree init --repo=$ATOMICDEST --mode=archive-z2;fi"
+$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "if [ ! -d $ATOMICREPO ]; then ostree init --repo=$ATOMICREPO --mode=archive-z2;fi"
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahosted.org/git/fedora-atomic.git $ATOMIC && pushd $ATOMIC && git log -n 1 --pretty='%h: %ci - %s' && git checkout ${GIT_BRANCH}"
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist=.*$|baseurl=http://kojipkgs.fedoraproject.org/mash/${DIST}/x86_64/os/|g' fedora*repo"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "rpm-ostree compose tree --repo=$ATOMICDEST $ATOMIC/fedora-atomic-docker-host.json >$logdir/atomic"
+$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "rpm-ostree compose tree --repo=$ATOMICREPO $ATOMIC/fedora-atomic-docker-host.json >$logdir/atomic"
 log "finished atomic tree creation"
 }
 
@@ -195,6 +195,8 @@ log "started compose sync"
 $RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS $RSYNC_EXTRA_OPTS --exclude repodata/ ${MASHDIR}/$BRANCHED$EXPANDARCH/ $DESTPATH
 # repodata & cleanup
 $RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS $RSYNC_EXTRA_OPTS --delete --delete-after ${MASHDIR}/$BRANCHED$EXPANDARCH/ $DESTPATH
+#rsync teh atomic tree
+$RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS $RSYNC_EXTRA_OPTS --delete --delete-after $ATOMICREPO $ATOMICDEST
 log "finished compose sync"
 
 if [ "$?" = "0" ]; then
diff --git a/scripts/buildbranched b/scripts/buildbranched
index c0a1020..93bf324 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -28,6 +28,7 @@ SUBJECT='F-'$BRANCHED' Branched report: '$DATE' changes'
 FROM="Fedora Branched Report <rawhide at fedoraproject.org>"
 RSYNCPREFIX="sudo -u ftpsync"
 ATOMIC=$(mktemp -d /tmp/atomici.${DIST}.$DATE.XXXX)
-ATOMICDEST="/mnt/fedora_koji/koji/mash/atomic/$BRANCHED/"
+ATOMICREPO="/mnt/fedora_koji/koji/mash/atomic/$BRANCHED/"
+ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
 
 source ./scripts/build-functions.sh
diff --git a/scripts/buildrawhide b/scripts/buildrawhide
index e6c1137..f8a9eab 100755
--- a/scripts/buildrawhide
+++ b/scripts/buildrawhide
@@ -28,6 +28,7 @@ SUBJECT='rawhide report: '$DATE' changes'
 FROM="Fedora Rawhide Report <rawhide at fedoraproject.org>"
 RSYNCPREFIX="sudo -u ftpsync"
 ATOMIC=$(mktemp -d /tmp/atomici.${DIST}.$DATE.XXXX)
-ATOMICDEST="/mnt/fedora_koji/koji/mash/atomic/$BRANCHED/"
+ATOMICREPO="/mnt/fedora_koji/koji/mash/atomic/$BRANCHED/"
+ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
 
 source ./scripts/build-functions.sh