From 6af3c6ba18f4fb5f9fef8d5a71f67d4ddfe4c751 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Feb 24 2016 18:36:36 +0000 Subject: setup for branched Signed-off-by: Dennis Gilmore --- diff --git a/fedora.conf b/fedora.conf index bb4db85..9ef0f6f 100644 --- a/fedora.conf +++ b/fedora.conf @@ -1,13 +1,13 @@ # PRODUCT INFO release_name = "Fedora" release_short = "Fedora" -release_version = "Rawhide" +release_version = "24" release_is_layered = False # GENERAL SETTINGS bootable = True -comps_file = "comps-rawhide.xml" #{ +comps_file = "comps-f24.xml" #{ # "scm": "git", # "repo": "git://git.fedorahosted.org/git/comps.git", # "branch": None, # defaults to cvs/HEAD or git/master diff --git a/nightly.sh b/nightly.sh index a1e5aee..b2283ab 100755 --- a/nightly.sh +++ b/nightly.sh @@ -4,22 +4,22 @@ export LC_ALL=C CONFIG="fedora.conf" -TARGET_DIR="/mnt/koji/compose/rawhide" +TARGET_DIR="/mnt/koji/compose/branched" #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR" NIGHTLY="--nightly" SKIP_PHASES="--skip-phase=productimg" DEST=$(pwd) DATE=$(date "+%Y%m%d") -DIST="rawhide" -BRANCH="rawhide" -COMPSFILE="comps-rawhide.xml" -GIT_BRANCH="master" +DIST="24" +BRANCHED="24" +COMPSFILE="comps-f24.xml" +GIT_BRANCH="f24" TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX` MOCK="/usr/bin/mock" TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org" TOMAIL="dennis@ausil.us" SUBJECT='rawhide report: '$DATE' changes' -FROM="Fedora Rawhide Report " +FROM="Fedora Branched Report " RSYNCPREFIX="sudo -u ftpsync" ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX) ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"