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

Branching F29 from rawhide

Browse Source 
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
Mohan Boddu 2018-08-13 14:06:19 -04:00
parent e5e137fff2
commit 054a33fdc4
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fedora.conf
View File

@ -1,7 +1,7 @@
# PRODUCT INFO
release_name = 'Fedora'
release_short = 'Fedora'
release_version = 'Rawhide'
release_version = '29'
release_is_layered = False
# GENERAL SETTINGS
@ -10,13 +10,13 @@ comps_file = {
'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'master',
'file': 'comps-rawhide.xml',
'command': 'make comps-rawhide.xml'
'file': 'comps-f29.xml',
'command': 'make comps-f29.xml'
}
module_defaults_dir = {
'scm': 'git',
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
'branch': 'master',
'branch': 'f29',
'dir': '.'
}
@ -292,9 +292,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/f29'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = 'Rawhide'
global_version = '29'
# live_images ignores this in favor of live_target
global_target = 'f29'
@ -752,7 +752,7 @@ ostree = [
"version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN',
"treefile": "fedora-atomic-host.json",
"config_url": "https://pagure.io/fedora-atomic.git",
"config_branch": "master",
"config_branch": "f29",
"repo": "Everything",
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
@ -762,7 +762,7 @@ ostree = [
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"treefile": "fedora-atomic-host.json",
"config_url": "https://pagure.io/fedora-atomic.git",
"config_branch": "master",
"config_branch": "f29",
"repo": "Everything",
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
@ -772,7 +772,7 @@ ostree = [
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"treefile": "fedora-atomic-host.json",
"config_url": "https://pagure.io/fedora-atomic.git",
"config_branch": "master",
"config_branch": "f29",
"repo": "Everything",
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
@ -784,7 +784,7 @@ ostree = [
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"treefile": "fedora-atomic-workstation.json",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "master",
"config_branch": "f29",
"repo": "Workstation",
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
@ -805,8 +805,8 @@ ostree_installer = [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
"ostree_osname=fedora-atomic",
"ostree_install_ref=fedora/rawhide/x86_64/atomic-host",
"ostree_update_ref=fedora/rawhide/x86_64/atomic-host",
"ostree_install_ref=fedora/29/x86_64/atomic-host",
"ostree_update_ref=fedora/29/x86_64/atomic-host",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master',
@ -822,8 +822,8 @@ ostree_installer = [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
"ostree_osname=fedora-atomic",
"ostree_install_ref=fedora/rawhide/aarch64/atomic-host",
"ostree_update_ref=fedora/rawhide/aarch64/atomic-host",
"ostree_install_ref=fedora/29/aarch64/atomic-host",
"ostree_update_ref=fedora/29/aarch64/atomic-host",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master',
@ -839,8 +839,8 @@ ostree_installer = [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
"ostree_osname=fedora-atomic",
"ostree_install_ref=fedora/rawhide/ppc64le/atomic-host",
"ostree_update_ref=fedora/rawhide/ppc64le/atomic-host",
"ostree_install_ref=fedora/29/ppc64le/atomic-host",
"ostree_update_ref=fedora/29/ppc64le/atomic-host",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master',
@ -858,8 +858,8 @@ ostree_installer = [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
"ostree_osname=fedora-workstation",
"ostree_install_ref=fedora/rawhide/x86_64/workstation",
"ostree_update_ref=fedora/rawhide/x86_64/workstation",
"ostree_install_ref=fedora/29/x86_64/workstation",
"ostree_update_ref=fedora/29/x86_64/workstation",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master',

12
nightly.sh
View File

@ -4,19 +4,19 @@
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")
SHORT="Fedora"
RELEASE="rawhide"
RELEASE_TITLE="Rawhide"
COMPSFILE="comps-rawhide.xml"
RELEASE="29"
RELEASE_TITLE="29"
COMPSFILE="comps-f29.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync"
RSYNCTARGET="/pub/fedora/linux/development/$RELEASE"
RSYNCALTTARGET="/pub/alt/development/$RELEASE"
@ -99,7 +99,7 @@ fi
/usr/share/mash/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/" >"$DESTDIR/logs/depcheck"
[ -z "$ARCH" ] && {
./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log
./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log
}
# Tell interested persons that the rsync is starting (zomg!)