Compare commits

...

22 Commits
main ... f37

Author SHA1 Message Date
Tomas Hrcka 375c1fe320 Update container config
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-11-24 14:45:44 +01:00
Tomas Hrcka 6fcacec0f2 Update container nightly script
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-11-24 14:29:50 +01:00
Kevin Fenzi 2da3e34515 f37-rc-1.7
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-11-04 21:44:18 -07:00
Kevin Fenzi a55810e554 rc-1.6
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-11-02 12:56:53 -07:00
Kevin Fenzi e8a949e856 1.5
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-10-30 16:22:27 -07:00
Kevin Fenzi 0d7bbc9a60 rc 1.4
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-10-24 11:27:05 -07:00
Tomas Hrcka 2a950abb1f RC 1.3
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-10-22 19:33:50 +02:00
Tomas Hrcka c070e46b3d RC 1.2
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-10-18 13:07:27 +02:00
Kevin Fenzi b35971f438 F37 rc1
I wasn't sure if the ostree installer flatpak runtimes should move to
f37 or not, but I think they should? If not, will revert that part.

* add server kvm image
* fixed media paths to have 1.1 in them.
* Updated release-candidate script
* update flatpak refs for kionite

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-10-17 23:58:49 +00:00
Kalev Lember 76da8dd8d0 Switch to F37 flatpak runtime for Silverblue and Kinoite
All the preinstalled apps are now rebuilt and using the F37 runtime.

Signed-off-by: Kalev Lember <klember@redhat.com>
2022-10-06 10:49:33 +02:00
Kevin Fenzi 71c03ea77a prep for beta rc-1.5
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-09-06 12:30:45 -07:00
Tomas Hrcka 888b4e9444 Add image build for Fedora Server KVM
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-09-06 19:02:11 +00:00
Kevin Fenzi 47e7b1e180 increase size of aarch64 Xfce to compose
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-09-03 10:42:25 -07:00
Kevin Fenzi 485d66e034 Beta 1.4: sync all other changes from nightly
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-09-03 10:00:49 -07:00
Kevin Fenzi 9c2672710c version 1.3, no changes here, pungi updated on compose host to pungi-4.3.5-8.fc36
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-09-02 21:52:05 -07:00
Kevin Fenzi ac4ab55e68 no more 32bit arm in f37, bump to 1.2
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-09-02 16:38:35 -07:00
Kevin Fenzi ad4be08407 Prep for f37 beta 1.1
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-09-02 15:59:25 -07:00
Adam Williamson 28e8b7b120 nightly.sh: update critpath.py call for recent changes
This uses the syntax after my recent PR:
https://pagure.io/releng/pull-request/11000
with those changes, this should actually work, instead of just
printing sad error messages like it does now!

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2022-08-30 18:28:16 -07:00
Kalev Lember acadbee831 Add systemd-pam to multilib whitelist
Move it to here instead of having systemd-devel fake require
systemd-pam.

This should help with flatpak runtime packaging so that we can avoid
having to ship systemd-pam in the flatpak container.

Signed-off-by: Kalev Lember <klember@redhat.com>
2022-08-18 18:38:29 +02:00
Kevin Fenzi e7e94c8cf9 disable gather profiler for now to avoid a race that causes composes to sometimes fail
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-08-17 09:53:44 -07:00
Kevin Fenzi 4ba5f68183 fix syntax issue with createrepo args
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-08-10 08:07:27 -07:00
Tomas Hrcka dd0b645fe6 Branch Fedora 37 from rawhide
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-08-09 12:00:35 +02:00
7 changed files with 2081 additions and 65 deletions

View File

@ -12,9 +12,9 @@ DEST=$(pwd)
DATE=$(date "+%Y%m%d")
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
SHORT="Fedora-Docker"
RELEASE="35"
RELEASE_TITLE="35"
COMPSFILE="comps-f35.xml"
RELEASE="37"
RELEASE_TITLE="37"
COMPSFILE="comps-f37.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="test-reports@lists.fedoraproject.org"
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"

1001
fedora-beta.conf Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
# PRODUCT INFO
release_name = 'Fedora-Container'
release_short = 'Fedora-Container'
release_version = '35'
release_version = '37'
release_is_layered = False
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
# GENERAL SETTINGS
@ -10,8 +10,8 @@ comps_file = {
'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'main',
'file': 'comps-f35.xml',
'command': 'make comps-f35.xml'
'file': 'comps-f37.xml',
'command': 'make comps-f37.xml'
}
variants_file='variants-fedora.xml'
sigkeys = ['5323552A'] # None = unsigned
@ -26,10 +26,10 @@ hashed_directories = True
runroot = True
#runroot_channel = 'fedora_compose'
runroot_channel = 'compose'
runroot_tag = 'f35-build'
runroot_tag = 'f37-build'
# PKGSET
pkgset_source = 'koji' # koji, repos
pkgset_koji_tag = 'f35-updates'
pkgset_koji_tag = 'f37-updates'
pkgset_koji_inherit = True
filter_system_release_packages = False
# GATHER
@ -214,10 +214,10 @@ translate_paths = [
]
# These will be inherited by live_media, live_images and image_build
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35'
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f37'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = '35'
global_target = 'f35'
global_version = '37'
global_target = 'f37'
image_build = {
'^Container$': [
@ -229,18 +229,18 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/',
'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/'
],
'subvariant': 'Container_Base'
},
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}',
'docker_env': '[ "DISTTAG=f37container", "FGC=f37", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "37"}',
},
},
{
@ -251,18 +251,18 @@ image_build = {
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/',
'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/'
],
'subvariant': 'Container_Minimal_Base',
},
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}',
'docker_env': '[ "DISTTAG=f37container", "FGC=f37", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "37"}',
},
}
],

1000
fedora-final.conf Normal file

File diff suppressed because it is too large Load Diff

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'
}
@ -63,7 +63,7 @@ gather_method = {
}
}
gather_backend = 'dnf'
gather_profiler = True
gather_profiler = False
check_deps = False
greedy_method = 'build'
@ -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
@ -270,6 +270,7 @@ multilib_whitelist = {
'syslinux-extlinux-nonlinux',
'syslinux-nonlinux',
'syslinux-tftpboot',
'systemd-pam',
'valgrind',
'vkBasalt',
'wine',
@ -364,9 +365,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'
@ -561,7 +562,7 @@ image_build = {
'name': 'Fedora-Xfce',
'kickstart': 'fedora-disk-xfce.ks',
'distro': 'Fedora-30',
'disk_size': 11,
'disk_size': 12,
'arches': ['aarch64'],
'repo': 'Everything',
'install_tree_from': 'Everything',
@ -601,6 +602,20 @@ image_build = {
'failable': ['*'],
}
},
{
'image-build': {
'format': [('qcow2','qcow2')],
'name': 'Fedora-Server-KVM',
'kickstart': 'fedora-server-vm-full.ks',
'distro': 'Fedora-22',
'disk_size': 7,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Server_KVM',
'failable': ['*'],
}
},
],
}
@ -794,11 +809,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 +822,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,16 +847,16 @@ 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
"flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
"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",
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f37 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 +873,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 +882,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,16 +899,16 @@ 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
"flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
"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",
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f37 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,16 +928,16 @@ 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
"flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f35",
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f37",
],
'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 +954,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 +963,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,16 +980,16 @@ 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
"flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f35",
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f37",
],
'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': ['*'],

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 --composeurl file://$DESTDIR/compose -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}"

View File

@ -5,13 +5,13 @@ LABEL=$1
# to the script are passed to pungi-koji directly.
shift
CONFIG="fedora-final.conf"
TARGET_DIR="/mnt/koji/compose/26"
TARGET_DIR="/mnt/koji/compose/37"
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
NIGHTLY=""
SKIP_PHASES="--skip-phase=productimg"
DEST=$(pwd)
DATE=$(date "+%Y%m%d")
COMPSFILE="comps-f26.xml"
COMPSFILE="comps-f37.xml"
TMPDIR=`mktemp -d /tmp/fedoraRC.$DATE.XXXX`
# uncomment and edit for resuming a failed compose
#COMPOSE_ID="Fedora-23-20150530.n.0"