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

Branch Fedora 37 from rawhide

Browse Source 
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
This commit is contained in:
Tomas Hrcka 2022-08-09 12:00:35 +02:00
parent 78252f90de
commit dd0b645fe6
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
fedora.conf
View File

@ -1,26 +1,26 @@
# PRODUCT INFO
release_name = 'Fedora'
release_short = 'Fedora'
release_version = 'Rawhide'
release_version = '37'
# GENERAL SETTINGS
comps_file = {
'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'main',
'file': 'comps-rawhide.xml',
'command': 'make comps-rawhide.xml'
'file': 'comps-f37.xml',
'command': 'make comps-f37.xml'
}
module_defaults_dir = {
'scm': 'git',
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
'branch': 'main',
'branch': 'f37',
'dir': '.'
}
module_obsoletes_dir = {
'scm': 'git',
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
'branch': 'main',
'branch': 'f37',
'dir': 'obsoletes'
}
@ -81,7 +81,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/%s' % pkgset_koji_tag ]']
createrepo_num_workers = 10
# CHECKSUMS
@ -364,9 +364,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/f37'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = 'Rawhide'
global_version = '37'
# live_images ignores this in favor of live_target
global_target = 'f37'
@ -794,11 +794,11 @@ ostree = {
"force_new_commit": True,
"treefile": "fedora-silverblue.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "main",
"config_branch": "f37",
"repo": "Everything",
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/silverblue",
"ostree_ref": "fedora/37/${basearch}/silverblue",
"arches": ["x86_64", "ppc64le", "aarch64"],
"failable": ['*'],
},
@ -807,11 +807,11 @@ ostree = {
"force_new_commit": True,
"treefile": "fedora-kinoite.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "main",
"config_branch": "f37",
"repo": "Everything",
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/kinoite",
"ostree_ref": "fedora/37/${basearch}/kinoite",
"arches": ["x86_64", "ppc64le", "aarch64"],
"failable": ['*'],
}
@ -832,8 +832,8 @@ ostree_installer = [
"ostree_osname=fedora",
"ostree_oskey=fedora-37-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/37/x86_64/silverblue",
"ostree_update_ref=fedora/37/x86_64/silverblue",
"flatpak_remote_name=fedora",
# using registry-no-cdn avoids redirects to the CDN;
# needed because of network restrictions on koji runroot
@ -841,7 +841,7 @@ ostree_installer = [
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f36 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.Connections/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.Extensions/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.TextEditor/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.fedoraproject.MediaWriter/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Weather/x86_64/stable",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'main',
'template_branch': 'f37',
# dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
'failable': ['*'],
@ -858,8 +858,8 @@ ostree_installer = [
"ostree_osname=fedora",
"ostree_oskey=fedora-37-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/37/ppc64le/silverblue",
"ostree_update_ref=fedora/37/ppc64le/silverblue",
"flatpak_remote_name=fedora",
# using registry-no-cdn avoids redirects to the CDN;
# needed because of network restrictions on koji runroot
@ -867,7 +867,7 @@ ostree_installer = [
"flatpak_remote_refs=",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'main',
'template_branch': 'f37',
# dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
'failable': ['*'],
@ -884,8 +884,8 @@ ostree_installer = [
"ostree_osname=fedora",
"ostree_oskey=fedora-37-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/37/aarch64/silverblue",
"ostree_update_ref=fedora/37/aarch64/silverblue",
"flatpak_remote_name=fedora",
# using registry-no-cdn avoids redirects to the CDN;
# needed because of network restrictions on koji runroot
@ -893,7 +893,7 @@ ostree_installer = [
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f36 app/org.gnome.baobab/aarch64/stable app/org.gnome.Calculator/aarch64/stable app/org.gnome.Calendar/aarch64/stable app/org.gnome.Characters/aarch64/stable app/org.gnome.clocks/aarch64/stable app/org.gnome.Connections/aarch64/stable app/org.gnome.Contacts/aarch64/stable app/org.gnome.eog/aarch64/stable app/org.gnome.Evince/aarch64/stable app/org.gnome.Extensions/aarch64/stable app/org.gnome.font-viewer/aarch64/stable app/org.gnome.TextEditor/aarch64/stable app/org.gnome.Logs/aarch64/stable app/org.gnome.Maps/aarch64/stable app/org.fedoraproject.MediaWriter/aarch64/stable app/org.gnome.NautilusPreviewer/aarch64/stable app/org.gnome.Weather/aarch64/stable",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'main',
'template_branch': 'f37',
# dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
'failable': ['*'],
@ -913,8 +913,8 @@ ostree_installer = [
"ostree_osname=fedora",
"ostree_oskey=fedora-37-primary",
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
"ostree_install_ref=fedora/rawhide/x86_64/kinoite",
"ostree_update_ref=fedora/rawhide/x86_64/kinoite",
"ostree_install_ref=fedora/37/x86_64/kinoite",
"ostree_update_ref=fedora/37/x86_64/kinoite",
"flatpak_remote_name=fedora",
# using registry-no-cdn avoids redirects to the CDN;
# needed because of network restrictions on koji runroot
@ -922,7 +922,7 @@ ostree_installer = [
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f35",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'main',
'template_branch': 'f37',
# dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
'failable': ['*'],
@ -939,8 +939,8 @@ ostree_installer = [
"ostree_osname=fedora",
"ostree_oskey=fedora-37-primary",
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
"ostree_install_ref=fedora/rawhide/ppc64le/kinoite",
"ostree_update_ref=fedora/rawhide/ppc64le/kinoite",
"ostree_install_ref=fedora/37/ppc64le/kinoite",
"ostree_update_ref=fedora/37/ppc64le/kinoite",
"flatpak_remote_name=fedora",
# using registry-no-cdn avoids redirects to the CDN;
# needed because of network restrictions on koji runroot
@ -948,7 +948,7 @@ ostree_installer = [
"flatpak_remote_refs=",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'main',
'template_branch': 'f37',
# dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
'failable': ['*'],
@ -965,8 +965,8 @@ ostree_installer = [
"ostree_osname=fedora",
"ostree_oskey=fedora-37-primary",
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
"ostree_install_ref=fedora/rawhide/aarch64/kinoite",
"ostree_update_ref=fedora/rawhide/aarch64/kinoite",
"ostree_install_ref=fedora/37/aarch64/kinoite",
"ostree_update_ref=fedora/37/aarch64/kinoite",
"flatpak_remote_name=fedora",
# using registry-no-cdn avoids redirects to the CDN;
# needed because of network restrictions on koji runroot
@ -974,7 +974,7 @@ ostree_installer = [
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f35",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'main',
'template_branch': 'f37',
# dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
'failable': ['*'],

12
nightly.sh
View File

@ -4,16 +4,16 @@
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=""
DEST=$(pwd)
DATE=$(date "+%Y%m%d")
SHORT="Fedora"
RELEASE="rawhide"
RELEASE_TITLE="Rawhide"
COMPSFILE="comps-rawhide.xml"
RELEASE="37"
RELEASE_TITLE="37"
COMPSFILE="comps-37.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="devel@lists.fedoraproject.org test-reports@lists.fedoraproject.org"
FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
@ -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!)
@ -201,7 +201,7 @@ old_umask=$(umask)
umask 0002
for variant in 'silverblue' 'kinoite'; do
for arch in x86_64 ppc64le aarch64; do
ref="fedora/rawhide/${arch}/${variant}"
ref="fedora/37/${arch}/${variant}"
if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi
ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"