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

Adjust for fedora-37 key and update fedora-cloud to f37

Browse Source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2022-02-08 15:24:48 -08:00
parent b6ce674030
commit d08f09f405
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fedora-cloud.conf
View File

@ -1,7 +1,7 @@
# PRODUCT INFO # PRODUCT INFO
release_name = 'Fedora-Cloud' release_name = 'Fedora-Cloud'
release_short = 'Fedora-Cloud' release_short = 'Fedora-Cloud'
release_version = '35' release_version = '37'
release_is_layered = False release_is_layered = False
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"] skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
# GENERAL SETTINGS # GENERAL SETTINGS
@ -10,11 +10,11 @@ comps_file = {
'scm': 'git', 'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git', 'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'main', 'branch': 'main',
'file': 'comps-f35.xml', 'file': 'comps-f37.xml',
'command': 'make comps-f35.xml' 'command': 'make comps-f37.xml'
} }
variants_file='variants-fedora.xml' variants_file='variants-fedora.xml'
sigkeys = ['429476B4'] # None = unsigned sigkeys = ['5323552A'] # None = unsigned
# limit tree architectures # limit tree architectures
# if undefined, all architectures from variants.xml will be included # if undefined, all architectures from variants.xml will be included
tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64'] tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
@ -26,10 +26,10 @@ hashed_directories = True
runroot = True runroot = True
#runroot_channel = 'fedora_compose' #runroot_channel = 'fedora_compose'
runroot_channel = 'compose' runroot_channel = 'compose'
runroot_tag = 'f35-build' runroot_tag = 'f37-build'
# PKGSET # PKGSET
pkgset_source = 'koji' # koji, repos pkgset_source = 'koji' # koji, repos
pkgset_koji_tag = 'f35-updates' pkgset_koji_tag = 'f37-updates'
pkgset_koji_inherit = True pkgset_koji_inherit = True
filter_system_release_packages = False filter_system_release_packages = False
# GATHER # GATHER
@ -218,19 +218,19 @@ image_build = {
'image-build': { 'image-build': {
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')], 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
'name': 'Fedora-Cloud-Base', 'name': 'Fedora-Cloud-Base',
'target': 'f35', 'target': 'f37',
'version': '35', 'version': '37',
'release': None, 'release': None,
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35', 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f37',
'kickstart': 'fedora-cloud-base.ks', 'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 4, 'disk_size': 4,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
'repo': [ 'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/'
], ],
'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/',
'subvariant': 'Cloud_Base' 'subvariant': 'Cloud_Base'
} }
}, },
@ -238,19 +238,19 @@ image_build = {
'image-build': { 'image-build': {
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')] 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
'name': 'Fedora-Cloud-Base-Vagrant', 'name': 'Fedora-Cloud-Base-Vagrant',
'target': 'f35', 'target': 'f37',
'version': '35', 'version': '37',
'release': None, 'release': None,
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35', 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f37',
'kickstart': 'fedora-cloud-base-vagrant.ks', 'kickstart': 'fedora-cloud-base-vagrant.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 40, 'disk_size': 40,
'arches': ['x86_64'], 'arches': ['x86_64'],
'repo': [ 'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/'
], ],
'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/',
'subvariant': 'Cloud_Base', 'subvariant': 'Cloud_Base',
} }
}, },

2
fedora-container.conf
View File

@ -14,7 +14,7 @@ comps_file = {
'command': 'make comps-f35.xml' 'command': 'make comps-f35.xml'
} }
variants_file='variants-fedora.xml' variants_file='variants-fedora.xml'
sigkeys = ['429476B4'] # None = unsigned sigkeys = ['5323552A'] # None = unsigned
# limit tree architectures # limit tree architectures
# if undefined, all architectures from variants.xml will be included # if undefined, all architectures from variants.xml will be included
tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'] tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64']

2
fedora.conf
View File

@ -25,7 +25,7 @@ module_obsoletes_dir = {
} }
variants_file='variants-fedora.xml' variants_file='variants-fedora.xml'
sigkeys = ['38AB71F4'] sigkeys = ['5323552A']
# limit tree architectures # limit tree architectures
# if undefined, all architectures from variants.xml will be included # if undefined, all architectures from variants.xml will be included