From 764ba668a98a447ae3d28981a287648c294d5607 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mar 31 2016 22:59:09 +0000
Subject:  remove the bolt on atomic hack


Signed-off-by: Dennis Gilmore <dennis@ausil.us>

---

diff --git a/nightly.sh b/nightly.sh
index f002311..a8c76da 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -75,36 +75,6 @@ fi
 NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-/COMPOSE_ID)
 SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
 
-DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
-MOCKCONFIG="fedora-${DIST}-compose-x86_64"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --init
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --install lorax rpm-ostree git
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "mkdir -p ${DESTDIR}/compose/Atomic/x86_64/iso"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell ""
-$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://pagure.io/fedora-atomic.git $ATOMIC && pushd $ATOMIC && git log -n 1 --pretty='%h: %ci - %s' && git checkout ${GIT_BRANCH}"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahosted.org/git/spin-kickstarts.git /spin-kickstarts && pushd /spin-kickstarts && 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/compose/$BRANCH/$NEWCOMPOSE_ID/compose/Everything/x86_64/os/|g' fedora*repo"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "rpm-ostree compose tree --repo=$ATOMICREPO $ATOMIC/fedora-atomic-docker-host.json >$logdir/atomic"
-
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "lorax --nomacboot -p Fedora -v ${BRANCHED} -r ${SHORTCOMPOSE_ID} \
-                                                 -s http://kojipkgs.fedoraproject.org/compose/$BRANCH/$NEWCOMPOSE_ID/compose/Everything/x86_64/os/ \
-                                                 -i fedora-productimg-atomic \
-                                                 -t Atomic \
-                                                 --tmp /tmp/ \
-                                                 --logfile=${DESTDIR}/logs/x86_64/atomic \
-                                                 --add-template /spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl \
-                                                 --add-template-var=ostree_osname=fedora-atomic \
-                                                 --add-arch-template-var=ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/$BRANCHED/ \
-                                                 --add-template-var=ostree_ref=fedora-atomic/${BRANCHED}/x86_64/docker-host \
-                                                 --add-arch-template /spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl \
-                                                 --add-arch-template-var=ostree_osname=fedora-atomic \
-                                                 --add-arch-template-var=ostree_ref=fedora-atomic/${BRANCHED}/x86_64/docker-host \
-                                                 ${DESTDIR}/compose/Atomic/x86_64/os/ "
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cp -l ${DESTDIR}/compose/Atomic/x86_64/os/images/boot.iso ${DESTDIR}/compose/Atomic/x86_64/iso/Fedora-Atomic-x86_64-${BRANCHED}-${DATE}.iso"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "pushd ${DESTDIR}/compose/Atomic/x86_64/iso/ ;sha256sum -b --tag *iso >Fedora-Atomic-${BRANCHED}-x86_64-CHECKSUM; popd"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --clean
-
 compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $TARGET_DIR/$NEWCOMPOSE_ID/
 /usr/share/mash/spam-o-matic $DESTDIR/compose/Everything/ >$DESTDIR/logs/depcheck