From 24ab077a3d32747aacc49622c42935f5f3334ce7 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mar 02 2016 23:45:32 +0000
Subject:  use BRANCHED not VERSION in atomic installer


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

---

diff --git a/nightly.sh b/nightly.sh
index 7375a6c..c0bfd99 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -76,7 +76,7 @@ $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahost
 $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 ${VERSION} -r ${SHORTCOMPOSE_ID} \
+$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 \
@@ -84,14 +84,14 @@ $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "lorax --nomacboot -p Fedora -v $
                                                  --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/$VERSION/ \
-                                                 --add-template-var=ostree_ref=fedora-atomic/${VERSION}/x86_64/docker-host \
+                                                 --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/${VERSION}/x86_64/docker-host \
+                                                 --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-${VERSION}-${DATE}.iso"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "pushd ${DESTDIR}/compose/Atomic/x86_64/iso/ ;sha256sum -b --tag *iso >Fedora-Atomic-${VERSION}-x86_64-CHECKSUM; popd"
+$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/