From 47103ea6b320e442c902e8636ba0fcb0bc0ada0a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 27 Feb 2017 18:30:35 -0500 Subject: [PATCH] Branching f26 from rawhide Signed-off-by: Mohan Boddu --- fedora.conf | 28 ++++++++++++++-------------- nightly.sh | 18 +++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/fedora.conf b/fedora.conf index f0af7b4..d53384e 100644 --- a/fedora.conf +++ b/fedora.conf @@ -1,12 +1,12 @@ # PRODUCT INFO release_name = 'Fedora' release_short = 'Fedora' -release_version = 'Rawhide' +release_version = '26' release_is_layered = False # GENERAL SETTINGS bootable = True -comps_file = 'comps-rawhide.xml' #{ +comps_file = 'comps-26.xml' #{ # 'scm': 'git', # 'repo': 'https://pagure.io/fedora-comps.git', # 'branch': None, # defaults to cvs/HEAD or git/master @@ -264,9 +264,9 @@ translate_paths = [ ] # These will be inherited by live_media, live_images and image_build -global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD' +global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26' global_release = None -global_version = 'Rawhide' +global_version = '26' # live_images ignores this in favor of live_target global_target = 'f26' @@ -605,14 +605,14 @@ ostree = [ "treefile": "fedora-atomic-docker-host.json", "config_url": "https://pagure.io/fedora-atomic.git", "source_repo_from": "Everything", - "ostree_repo": "/mnt/koji/compose/atomic/rawhide/", + "ostree_repo": "/mnt/koji/compose/atomic/26/", 'failable': ['*'], }, "x86_64": { "treefile": "fedora-atomic-docker-host.json", "config_url": "https://pagure.io/fedora-atomic.git", "source_repo_from": "Everything", - "ostree_repo": "/mnt/koji/compose/atomic/rawhide/", + "ostree_repo": "/mnt/koji/compose/atomic/26/", 'failable': ['*'], } }), @@ -621,7 +621,7 @@ ostree = [ "treefile": "fedora-ostree-workstation.json", "config_url": "https://pagure.io/workstation-ostree-config.git", "source_repo_from": "Workstation", - "ostree_repo": "/mnt/koji/compose/ostree/rawhide/", + "ostree_repo": "/mnt/koji/compose/ostree/26/", 'failable': ['*'], } }) @@ -636,16 +636,16 @@ ostree_installer = [ "add_template": ["atomic-installer/lorax-configure-repo.tmpl"], "add_template_var": [ "ostree_osname=fedora-atomic", - "ostree_ref=fedora/rawhide/x86_64/atomic-host", + "ostree_ref=fedora/26/x86_64/atomic-host", ], "add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"], "add_arch_template_var": [ "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/", "ostree_osname=fedora-atomic", - "ostree_ref=fedora/rawhide/x86_64/atomic-host", + "ostree_ref=fedora/26/x86_64/atomic-host", ] 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'master', + 'template_branch': 'f26', 'failable': ['*'], } }), @@ -657,16 +657,16 @@ ostree_installer = [ "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"], "add_template_var": [ "ostree_osname=fedora-workstation", - "ostree_ref=fedora/rawhide/x86_64/workstation", + "ostree_ref=fedora/26/x86_64/workstation", ], "add_arch_template": ["workstation-ostree-installer/lorax-embed-repo.tmpl"], "add_arch_template_var": [ - "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/", + "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/26/", "ostree_osname=fedora-workstation", - "ostree_ref=fedora/rawhide/x86_64/workstation", + "ostree_ref=fedora/26/x86_64/workstation", ] 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'master', + 'template_branch': 'f26', 'failable': ['*'], } }) diff --git a/nightly.sh b/nightly.sh index 30668b2..a8e7424 100755 --- a/nightly.sh +++ b/nightly.sh @@ -4,25 +4,25 @@ 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" -BRANCHED="rawhide" -BRANCH="rawhide" -COMPSFILE="comps-rawhide.xml" -GIT_BRANCH="master" +DIST="26" +BRANCHED="26" +BRANCH="branched" +COMPSFILE="comps-26.xml" +GIT_BRANCH="f26" TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX` TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org" -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/" ATOMICDEST="/mnt/koji/atomic/$BRANCHED/" -OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Rawhide/COMPOSE_ID) +OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/COMPOSE_ID) # uncomment and edit for resuming a failed compose #COMPOSE_ID="Fedora-23-20150530.n.0" @@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then exit 1 fi -NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Rawhide/COMPOSE_ID) +NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/COMPOSE_ID) SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID") fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")