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

Setup for rawhide being F33

Browse Source 
This needs changes to add f33 key.
It will be added later once everything is signed with f33 key.

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
Mohan Boddu 2020-02-11 08:57:09 -05:00
parent d35e18e8a5
commit ee58c06879
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fedora.conf
View File

@ -19,7 +19,7 @@ module_defaults_dir = {
}
variants_file='variants-fedora.xml'
sigkeys = ['12C944D0']
sigkeys = ['9570FF31', '12C944D0']
# limit tree architectures
# if undefined, all architectures from variants.xml will be included
@ -34,7 +34,7 @@ hashed_directories = True
# RUNROOT settings
runroot_method = 'koji'
runroot_channel = 'compose'
runroot_tag = 'f32-build'
runroot_tag = 'f33-build'
# PKGSET
pkgset_source = 'koji' # koji, repos
@ -44,7 +44,7 @@ pkgset_source = 'koji' # koji, repos
# pkgset_repos = {}
# PKGSET - KOJI
pkgset_koji_tag = 'f32'
pkgset_koji_tag = 'f33'
pkgset_koji_inherit = False
filter_system_release_packages = False
@ -293,7 +293,7 @@ global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = 'Rawhide'
# live_images ignores this in favor of live_target
global_target = 'f32'
global_target = 'f33'
image_build = {
'^Container$': [
@ -313,8 +313,8 @@ image_build = {
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f32container", "FGC=f32", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}',
'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}',
},
},
{
@ -333,8 +333,8 @@ image_build = {
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f32container", "FGC=f32", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}',
'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}',
},
}
],
@ -645,7 +645,7 @@ failable_deliverables = [
})
]
live_target = 'f32'
live_target = 'f33'
live_images_no_rename = True
# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
live_images = [
@ -765,7 +765,7 @@ ostree_installer = [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
"ostree_update_repo=https://ostree.fedoraproject.org",
"ostree_osname=fedora",
"ostree_oskey=fedora-32-primary",
"ostree_oskey=fedora-33-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",
@ -791,7 +791,7 @@ ostree_installer = [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
"ostree_update_repo=https://ostree.fedoraproject.org",
"ostree_osname=fedora",
"ostree_oskey=fedora-32-primary",
"ostree_oskey=fedora-33-primary",
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
"ostree_install_ref=fedora/rawhide/ppc64le/silverblue",
"ostree_update_ref=fedora/rawhide/ppc64le/silverblue",
@ -817,7 +817,7 @@ ostree_installer = [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
"ostree_update_repo=https://ostree.fedoraproject.org",
"ostree_osname=fedora",
"ostree_oskey=fedora-32-primary",
"ostree_oskey=fedora-33-primary",
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
"ostree_install_ref=fedora/rawhide/aarch64/silverblue",
"ostree_update_ref=fedora/rawhide/aarch64/silverblue",

2
nightly.sh
View File

@ -198,7 +198,7 @@ done
# Push rawhide base container image to fedora registry
pushd ./releng
pushd ./scripts
./sync-latest-container-base-image.sh 32
./sync-latest-container-base-image.sh 33
popd
popd

2
variants-fedora.xml
View File

@ -95,7 +95,7 @@
<arch>x86_64</arch>
</arches>
<modules>
<kojitag>f32-modular</kojitag>
<kojitag>f33-modular</kojitag>
</modules>
</variant>
</variants>