Setup for rawhide being F34
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
This commit is contained in:
parent
e2669c2b95
commit
c7739bf877
24
fedora.conf
24
fedora.conf
@ -19,7 +19,7 @@ module_defaults_dir = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
variants_file='variants-fedora.xml'
|
variants_file='variants-fedora.xml'
|
||||||
sigkeys = ['9570FF31']
|
sigkeys = ['45719A39', '9570FF31']
|
||||||
|
|
||||||
# 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
|
||||||
@ -34,7 +34,7 @@ hashed_directories = True
|
|||||||
# RUNROOT settings
|
# RUNROOT settings
|
||||||
runroot_method = 'koji'
|
runroot_method = 'koji'
|
||||||
runroot_channel = 'compose'
|
runroot_channel = 'compose'
|
||||||
runroot_tag = 'f33-build'
|
runroot_tag = 'f34-build'
|
||||||
|
|
||||||
# PKGSET
|
# PKGSET
|
||||||
pkgset_source = 'koji' # koji, repos
|
pkgset_source = 'koji' # koji, repos
|
||||||
@ -44,7 +44,7 @@ pkgset_source = 'koji' # koji, repos
|
|||||||
# pkgset_repos = {}
|
# pkgset_repos = {}
|
||||||
|
|
||||||
# PKGSET - KOJI
|
# PKGSET - KOJI
|
||||||
pkgset_koji_tag = 'f33'
|
pkgset_koji_tag = 'f34'
|
||||||
pkgset_koji_inherit = False
|
pkgset_koji_inherit = False
|
||||||
|
|
||||||
filter_system_release_packages = False
|
filter_system_release_packages = False
|
||||||
@ -294,7 +294,7 @@ global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
|
|||||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||||
global_version = 'Rawhide'
|
global_version = 'Rawhide'
|
||||||
# live_images ignores this in favor of live_target
|
# live_images ignores this in favor of live_target
|
||||||
global_target = 'f33'
|
global_target = 'f34'
|
||||||
|
|
||||||
image_build = {
|
image_build = {
|
||||||
'^Container$': [
|
'^Container$': [
|
||||||
@ -314,8 +314,8 @@ image_build = {
|
|||||||
'factory-parameters': {
|
'factory-parameters': {
|
||||||
'dockerversion': "1.10.1",
|
'dockerversion': "1.10.1",
|
||||||
'docker_cmd': '[ "/bin/bash" ]',
|
'docker_cmd': '[ "/bin/bash" ]',
|
||||||
'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]',
|
'docker_env': '[ "DISTTAG=f34container", "FGC=f34", "container=oci" ]',
|
||||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}',
|
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -334,8 +334,8 @@ image_build = {
|
|||||||
'factory-parameters': {
|
'factory-parameters': {
|
||||||
'dockerversion': "1.10.1",
|
'dockerversion': "1.10.1",
|
||||||
'docker_cmd': '[ "/bin/bash" ]',
|
'docker_cmd': '[ "/bin/bash" ]',
|
||||||
'docker_env': '[ "DISTTAG=f33container", "FGC=f33", "container=oci" ]',
|
'docker_env': '[ "DISTTAG=f34container", "FGC=f34", "container=oci" ]',
|
||||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "33"}',
|
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@ -646,7 +646,7 @@ failable_deliverables = [
|
|||||||
})
|
})
|
||||||
]
|
]
|
||||||
|
|
||||||
live_target = 'f33'
|
live_target = 'f34'
|
||||||
live_images_no_rename = True
|
live_images_no_rename = True
|
||||||
# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
|
# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
|
||||||
live_images = [
|
live_images = [
|
||||||
@ -766,7 +766,7 @@ ostree_installer = [
|
|||||||
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
|
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
|
||||||
"ostree_update_repo=https://ostree.fedoraproject.org",
|
"ostree_update_repo=https://ostree.fedoraproject.org",
|
||||||
"ostree_osname=fedora",
|
"ostree_osname=fedora",
|
||||||
"ostree_oskey=fedora-33-primary",
|
"ostree_oskey=fedora-34-primary",
|
||||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||||
"ostree_install_ref=fedora/rawhide/x86_64/silverblue",
|
"ostree_install_ref=fedora/rawhide/x86_64/silverblue",
|
||||||
"ostree_update_ref=fedora/rawhide/x86_64/silverblue",
|
"ostree_update_ref=fedora/rawhide/x86_64/silverblue",
|
||||||
@ -792,7 +792,7 @@ ostree_installer = [
|
|||||||
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
|
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
|
||||||
"ostree_update_repo=https://ostree.fedoraproject.org",
|
"ostree_update_repo=https://ostree.fedoraproject.org",
|
||||||
"ostree_osname=fedora",
|
"ostree_osname=fedora",
|
||||||
"ostree_oskey=fedora-33-primary",
|
"ostree_oskey=fedora-34-primary",
|
||||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||||
"ostree_install_ref=fedora/rawhide/ppc64le/silverblue",
|
"ostree_install_ref=fedora/rawhide/ppc64le/silverblue",
|
||||||
"ostree_update_ref=fedora/rawhide/ppc64le/silverblue",
|
"ostree_update_ref=fedora/rawhide/ppc64le/silverblue",
|
||||||
@ -818,7 +818,7 @@ ostree_installer = [
|
|||||||
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
|
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",
|
||||||
"ostree_update_repo=https://ostree.fedoraproject.org",
|
"ostree_update_repo=https://ostree.fedoraproject.org",
|
||||||
"ostree_osname=fedora",
|
"ostree_osname=fedora",
|
||||||
"ostree_oskey=fedora-33-primary",
|
"ostree_oskey=fedora-34-primary",
|
||||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||||
"ostree_install_ref=fedora/rawhide/aarch64/silverblue",
|
"ostree_install_ref=fedora/rawhide/aarch64/silverblue",
|
||||||
"ostree_update_ref=fedora/rawhide/aarch64/silverblue",
|
"ostree_update_ref=fedora/rawhide/aarch64/silverblue",
|
||||||
|
@ -204,7 +204,7 @@ umask $old_umask
|
|||||||
# Push rawhide base container image to fedora registry
|
# Push rawhide base container image to fedora registry
|
||||||
pushd ./releng
|
pushd ./releng
|
||||||
pushd ./scripts
|
pushd ./scripts
|
||||||
./sync-latest-container-base-image.sh 33
|
./sync-latest-container-base-image.sh 34
|
||||||
popd
|
popd
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
@ -95,7 +95,7 @@
|
|||||||
<arch>x86_64</arch>
|
<arch>x86_64</arch>
|
||||||
</arches>
|
</arches>
|
||||||
<modules>
|
<modules>
|
||||||
<kojitag>f33-modular</kojitag>
|
<kojitag>f34-modular</kojitag>
|
||||||
</modules>
|
</modules>
|
||||||
</variant>
|
</variant>
|
||||||
</variants>
|
</variants>
|
||||||
|
Loading…
Reference in New Issue
Block a user