davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use BRANCHED not VERSION in atomic installer

Browse Source 
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2016-03-02 17:46:26 -06:00
parent 9dc2ae89a9
commit 91b28be08f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nightly.sh
View File

@ -75,7 +75,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 \
@ -83,14 +83,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/