Branching F32 from rawhide
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
Mohan Boddu
parent
d35e18e8a5
commit
7500d1ea87
34
fedora.conf
34
fedora.conf
@ -1,20 +1,20 @@
|
||||
# PRODUCT INFO
|
||||
release_name = 'Fedora'
|
||||
release_short = 'Fedora'
|
||||
release_version = 'Rawhide'
|
||||
release_version = '32'
|
||||
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/fedora-comps.git',
|
||||
'branch': 'master',
|
||||
'file': 'comps-rawhide.xml',
|
||||
'command': 'make comps-rawhide.xml'
|
||||
'file': 'comps-f32.xml',
|
||||
'command': 'make comps-f32.xml'
|
||||
}
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
|
||||
'branch': 'master',
|
||||
'branch': 'f32',
|
||||
'dir': '.'
|
||||
}
|
||||
|
||||
@ -75,7 +75,7 @@ repoclosure_backend = 'dnf'
|
||||
createrepo_deltas = False
|
||||
createrepo_database = True
|
||||
createrepo_use_xz = True
|
||||
createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/rawhide']
|
||||
createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/' % pkgset_koji_tag]
|
||||
createrepo_num_workers = 10
|
||||
|
||||
# CHECKSUMS
|
||||
@ -291,7 +291,7 @@ 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_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||
global_version = 'Rawhide'
|
||||
global_version = '32'
|
||||
# live_images ignores this in favor of live_target
|
||||
global_target = 'f32'
|
||||
|
||||
@ -742,11 +742,11 @@ ostree = {
|
||||
"force_new_commit": True,
|
||||
"treefile": "fedora-silverblue.yaml",
|
||||
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
||||
"config_branch": "master",
|
||||
"config_branch": "f32",
|
||||
"repo": "Everything",
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
||||
"ostree_ref": "fedora/rawhide/${basearch}/silverblue",
|
||||
"ostree_ref": "fedora/32/${basearch}/silverblue",
|
||||
"arches": ["x86_64", "ppc64le", "aarch64"],
|
||||
"failable": ['*'],
|
||||
}
|
||||
@ -767,8 +767,8 @@ ostree_installer = [
|
||||
"ostree_osname=fedora",
|
||||
"ostree_oskey=fedora-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/rawhide/x86_64/silverblue",
|
||||
"ostree_update_ref=fedora/rawhide/x86_64/silverblue",
|
||||
"ostree_install_ref=fedora/32/x86_64/silverblue",
|
||||
"ostree_update_ref=fedora/32/x86_64/silverblue",
|
||||
"flatpak_remote_name=fedora",
|
||||
# using registry-no-cdn avoids redirects to the CDN;
|
||||
# needed because of network restrictions on koji runroot
|
||||
@ -776,7 +776,7 @@ ostree_installer = [
|
||||
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f31 app/org.gnome.Baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'failable': ['*'],
|
||||
},
|
||||
@ -793,8 +793,8 @@ ostree_installer = [
|
||||
"ostree_osname=fedora",
|
||||
"ostree_oskey=fedora-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/rawhide/ppc64le/silverblue",
|
||||
"ostree_update_ref=fedora/rawhide/ppc64le/silverblue",
|
||||
"ostree_install_ref=fedora/32/ppc64le/silverblue",
|
||||
"ostree_update_ref=fedora/32/ppc64le/silverblue",
|
||||
"flatpak_remote_name=fedora",
|
||||
# using registry-no-cdn avoids redirects to the CDN;
|
||||
# needed because of network restrictions on koji runroot
|
||||
@ -802,7 +802,7 @@ ostree_installer = [
|
||||
"flatpak_remote_refs=",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'failable': ['*'],
|
||||
},
|
||||
@ -819,8 +819,8 @@ ostree_installer = [
|
||||
"ostree_osname=fedora",
|
||||
"ostree_oskey=fedora-32-primary",
|
||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||
"ostree_install_ref=fedora/rawhide/aarch64/silverblue",
|
||||
"ostree_update_ref=fedora/rawhide/aarch64/silverblue",
|
||||
"ostree_install_ref=fedora/32/aarch64/silverblue",
|
||||
"ostree_update_ref=fedora/32/aarch64/silverblue",
|
||||
"flatpak_remote_name=fedora",
|
||||
# using registry-no-cdn avoids redirects to the CDN;
|
||||
# needed because of network restrictions on koji runroot
|
||||
@ -828,7 +828,7 @@ ostree_installer = [
|
||||
"flatpak_remote_refs=",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
'template_branch': 'master',
|
||||
'template_branch': 'f32',
|
||||
'extra_runroot_pkgs': ['flatpak'],
|
||||
'failable': ['*'],
|
||||
}
|
||||
|
||||
21
nightly.sh
21
nightly.sh
@ -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="32"
|
||||
RELEASE_TITLE="32"
|
||||
COMPSFILE="comps-f32.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"
|
||||
@ -111,7 +111,7 @@ fi
|
||||
./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/" --only-arches ppc64le s390x x86_64> "$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!)
|
||||
@ -188,20 +188,13 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWC
|
||||
|
||||
# sync Silverblue to the unified ostree repo
|
||||
for arch in x86_64 ppc64le aarch64; do
|
||||
ref="fedora/rawhide/${arch}/silverblue"
|
||||
ref="fedora/32/${arch}/silverblue"
|
||||
if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi
|
||||
|
||||
ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"
|
||||
ostree summary -u --repo=$OSTREEDESTREPO # update summary file
|
||||
done
|
||||
|
||||
# Push rawhide base container image to fedora registry
|
||||
pushd ./releng
|
||||
pushd ./scripts
|
||||
./sync-latest-container-base-image.sh 32
|
||||
popd
|
||||
popd
|
||||
|
||||
# Tell interested persons that the rsync is done.
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user