[releng] buildbranched: Use $GIT_BRANCH

Till Maas till at fedoraproject.org
Mon Nov 10 15:48:45 UTC 2014


commit cc3074e33f116cf04c5076cbe1d28eafcd1514a3
Author: Till Maas <opensource at till.name>
Date:   Mon Nov 10 16:37:16 2014 +0100

    buildbranched: Use $GIT_BRANCH

 scripts/buildbranched |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/buildbranched b/scripts/buildbranched
index c31b354..2032860 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -154,7 +154,7 @@ 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 ;fi"
-$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahosted.org/git/fedora-atomic.git $ATOMIC && pushd $ATOMIC && git checkout f$VERSION"
+$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahosted.org/git/fedora-atomic.git $ATOMIC && pushd $ATOMIC && git checkout ${GIT_BRANCH}"
 $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist.*$|baseurl=http://kojipkgs.fedoraproject.org/mash/branched/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"
 log "finished atomic tree creation"


More information about the rel-eng mailing list