| |
@@ -1,7 +1,7 @@
|
| |
# PRODUCT INFO
|
| |
release_name = 'Fedora-Container'
|
| |
release_short = 'Fedora-Container'
|
| |
- release_version = '29'
|
| |
+ release_version = '31'
|
| |
release_is_layered = False
|
| |
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
|
| |
# GENERAL SETTINGS
|
| |
@@ -10,11 +10,11 @@
|
| |
'scm': 'git',
|
| |
'repo': 'https://pagure.io/fedora-comps.git',
|
| |
'branch': 'master',
|
| |
- 'file': 'comps-f29.xml',
|
| |
- 'command': 'make comps-f29.xml'
|
| |
+ 'file': 'comps-f31.xml',
|
| |
+ 'command': 'make comps-f31.xml'
|
| |
}
|
| |
variants_file='variants-fedora.xml'
|
| |
- sigkeys = ['429476B4'] # None = unsigned
|
| |
+ sigkeys = ['3C3359C4'] # None = unsigned
|
| |
# limit tree architectures
|
| |
# if undefined, all architectures from variants.xml will be included
|
| |
tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64']
|
| |
@@ -26,10 +26,10 @@
|
| |
runroot = True
|
| |
#runroot_channel = 'fedora_compose'
|
| |
runroot_channel = 'compose'
|
| |
- runroot_tag = 'f29-build'
|
| |
+ runroot_tag = 'f31-build'
|
| |
# PKGSET
|
| |
pkgset_source = 'koji' # koji, repos
|
| |
- pkgset_koji_tag = 'f29-updates'
|
| |
+ pkgset_koji_tag = 'f31-updates'
|
| |
pkgset_koji_inherit = True
|
| |
filter_system_release_packages = False
|
| |
# GATHER
|
| |
@@ -209,10 +209,10 @@
|
| |
]
|
| |
|
| |
# These will be inherited by live_media, live_images and image_build
|
| |
- global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29'
|
| |
+ global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f31'
|
| |
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
| |
- global_version = '29'
|
| |
- global_target = 'f29'
|
| |
+ global_version = '31'
|
| |
+ global_target = 'f31'
|
| |
|
| |
image_build = {
|
| |
'^Container$': [
|
| |
@@ -224,18 +224,19 @@
|
| |
'distro': 'Fedora-22',
|
| |
'disk_size': 5,
|
| |
'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
|
| |
- 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
|
| |
+ 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/',
|
| |
'repo': [
|
| |
- 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
|
| |
- 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
|
| |
+ 'https://kojipkgs.fedoraproject.org/compose/updates/f31-updates/compose/Everything/$arch/os/'
|
| |
+ 'https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/'
|
| |
],
|
| |
- 'subvariant': 'Container_Base'
|
| |
+ 'subvariant': 'Container_Base',
|
| |
+ 'failable': ['armhfp']
|
| |
},
|
| |
'factory-parameters': {
|
| |
'dockerversion': "1.10.1",
|
| |
'docker_cmd': '[ "/bin/bash" ]',
|
| |
- 'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]',
|
| |
- 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
|
| |
+ 'docker_env': '[ "DISTTAG=f31container", "FGC=f31", "container=oci" ]',
|
| |
+ 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "31"}',
|
| |
},
|
| |
},
|
| |
{
|
| |
@@ -246,18 +247,19 @@
|
| |
'distro': 'Fedora-22',
|
| |
'disk_size': 5,
|
| |
'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
|
| |
- 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
|
| |
+ 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/',
|
| |
'repo': [
|
| |
- 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
|
| |
- 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
|
| |
+ 'https://kojipkgs.fedoraproject.org/compose/updates/f31-updates/compose/Everything/$arch/os/'
|
| |
+ 'https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/'
|
| |
],
|
| |
'subvariant': 'Container_Minimal_Base',
|
| |
+ 'failable': ['armhfp']
|
| |
},
|
| |
'factory-parameters': {
|
| |
'dockerversion': "1.10.1",
|
| |
'docker_cmd': '[ "/bin/bash" ]',
|
| |
- 'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]',
|
| |
- 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
|
| |
+ 'docker_env': '[ "DISTTAG=f31container", "FGC=f31", "container=oci" ]',
|
| |
+ 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "31"}',
|
| |
},
|
| |
}
|
| |
],
|
| |
Signed-off-by: Mohan Boddu mboddu@bhujji.com