Rawhide is now f40
Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
This commit is contained in:
parent
40d8c84354
commit
49bc2e943e
|
@ -13,9 +13,9 @@ DEST=$(pwd)
|
||||||
DATE=$(date "+%Y%m%d")
|
DATE=$(date "+%Y%m%d")
|
||||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||||
SHORT="Fedora-Cloud"
|
SHORT="Fedora-Cloud"
|
||||||
RELEASE="39"
|
RELEASE="40"
|
||||||
RELEASE_TITLE="39"
|
RELEASE_TITLE="40"
|
||||||
COMPSFILE="comps-f39.xml"
|
COMPSFILE="comps-f40.xml"
|
||||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||||
TOMAIL="test-reports@lists.fedoraproject.org"
|
TOMAIL="test-reports@lists.fedoraproject.org"
|
||||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||||
|
|
|
@ -12,9 +12,9 @@ DEST=$(pwd)
|
||||||
DATE=$(date "+%Y%m%d")
|
DATE=$(date "+%Y%m%d")
|
||||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||||
SHORT="Fedora-Docker"
|
SHORT="Fedora-Docker"
|
||||||
RELEASE="39"
|
RELEASE="40"
|
||||||
RELEASE_TITLE="39"
|
RELEASE_TITLE="40"
|
||||||
COMPSFILE="comps-f39.xml"
|
COMPSFILE="comps-f40.xml"
|
||||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||||
TOMAIL="test-reports@lists.fedoraproject.org"
|
TOMAIL="test-reports@lists.fedoraproject.org"
|
||||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||||
|
|
|
@ -6,24 +6,24 @@ from multilib import *
|
||||||
# PRODUCT INFO
|
# PRODUCT INFO
|
||||||
release_name = 'Fedora-Cloud'
|
release_name = 'Fedora-Cloud'
|
||||||
release_short = 'Fedora-Cloud'
|
release_short = 'Fedora-Cloud'
|
||||||
release_version = '39'
|
release_version = '40'
|
||||||
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
|
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
|
||||||
# GENERAL SETTINGS
|
# GENERAL SETTINGS
|
||||||
comps_file = {
|
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-f39.xml',
|
'file': 'comps-f40.xml',
|
||||||
'command': 'make comps-f39.xml'
|
'command': 'make comps-f40.xml'
|
||||||
}
|
}
|
||||||
variants_file='variants-fedora.xml'
|
variants_file='variants-fedora.xml'
|
||||||
sigkeys = ['5323552A'] # None = unsigned
|
sigkeys = ['a15B79cc'] # None = unsigned
|
||||||
|
|
||||||
# limit tree variants
|
# limit tree variants
|
||||||
# if undefined, all variants from variants.xml will be included
|
# if undefined, all variants from variants.xml will be included
|
||||||
tree_variants = ['Cloud']
|
tree_variants = ['Cloud']
|
||||||
# PKGSET
|
# PKGSET
|
||||||
pkgset_koji_tag = 'f39-updates'
|
pkgset_koji_tag = 'f40-updates'
|
||||||
pkgset_koji_inherit = True
|
pkgset_koji_inherit = True
|
||||||
# GATHER
|
# GATHER
|
||||||
gather_method = 'deps'
|
gather_method = 'deps'
|
||||||
|
@ -141,19 +141,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': 'f39',
|
'target': 'f40',
|
||||||
'version': '39',
|
'version': '40',
|
||||||
'release': None,
|
'release': None,
|
||||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f39',
|
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',
|
||||||
'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/f39-updates/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
|
||||||
'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
|
||||||
],
|
],
|
||||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/',
|
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
|
||||||
'subvariant': 'Cloud_Base'
|
'subvariant': 'Cloud_Base'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -161,19 +161,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': 'f39',
|
'target': 'f40',
|
||||||
'version': '39',
|
'version': '40',
|
||||||
'release': None,
|
'release': None,
|
||||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f39',
|
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',
|
||||||
'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/f39-updates/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
|
||||||
'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
|
||||||
],
|
],
|
||||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/',
|
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
|
||||||
'subvariant': 'Cloud_Base',
|
'subvariant': 'Cloud_Base',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -181,19 +181,19 @@ image_build = {
|
||||||
'image-build': {
|
'image-build': {
|
||||||
'format': [('vpc','vpc')],
|
'format': [('vpc','vpc')],
|
||||||
'name': 'Fedora-Cloud-Base-Azure',
|
'name': 'Fedora-Cloud-Base-Azure',
|
||||||
'target': 'f39',
|
'target': 'f40',
|
||||||
'version': '39',
|
'version': '40',
|
||||||
'release': None,
|
'release': None,
|
||||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f39',
|
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',
|
||||||
'kickstart': 'fedora-cloud-base-azure.ks',
|
'kickstart': 'fedora-cloud-base-azure.ks',
|
||||||
'distro': 'Fedora-30',
|
'distro': 'Fedora-30',
|
||||||
'disk_size': 10,
|
'disk_size': 10,
|
||||||
'arches': ['aarch64', 'x86_64'],
|
'arches': ['aarch64', 'x86_64'],
|
||||||
'repo': [
|
'repo': [
|
||||||
'https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
|
||||||
'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
|
||||||
],
|
],
|
||||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/',
|
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
|
||||||
'subvariant': 'Cloud_Base'
|
'subvariant': 'Cloud_Base'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -6,22 +6,22 @@ from multilib import *
|
||||||
# PRODUCT INFO
|
# PRODUCT INFO
|
||||||
release_name = 'Fedora-Container'
|
release_name = 'Fedora-Container'
|
||||||
release_short = 'Fedora-Container'
|
release_short = 'Fedora-Container'
|
||||||
release_version = '39'
|
release_version = '40'
|
||||||
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
|
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
|
||||||
# GENERAL SETTINGS
|
# GENERAL SETTINGS
|
||||||
comps_file = {
|
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-f39.xml',
|
'file': 'comps-f40.xml',
|
||||||
'command': 'make comps-f39.xml'
|
'command': 'make comps-f40.xml'
|
||||||
}
|
}
|
||||||
sigkeys = ['5323552A'] # None = unsigned
|
sigkeys = ['a15B79cc'] # None = unsigned
|
||||||
# limit tree variants
|
# limit tree variants
|
||||||
# if undefined, all variants from variants.xml will be included
|
# if undefined, all variants from variants.xml will be included
|
||||||
tree_variants = ['Container']
|
tree_variants = ['Container']
|
||||||
# PKGSET
|
# PKGSET
|
||||||
pkgset_koji_tag = 'f39-updates'
|
pkgset_koji_tag = 'f40-updates'
|
||||||
pkgset_koji_inherit = True
|
pkgset_koji_inherit = True
|
||||||
# GATHER
|
# GATHER
|
||||||
gather_method = 'deps'
|
gather_method = 'deps'
|
||||||
|
@ -135,10 +135,10 @@ image_volid_formats = [
|
||||||
]
|
]
|
||||||
|
|
||||||
# These will be inherited by live_media, live_images and image_build
|
# These will be inherited by live_media, live_images and image_build
|
||||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f39'
|
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40'
|
||||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||||
global_version = '39'
|
global_version = '40'
|
||||||
global_target = 'f39'
|
global_target = 'f40'
|
||||||
|
|
||||||
image_build = {
|
image_build = {
|
||||||
'^Container$': [
|
'^Container$': [
|
||||||
|
@ -150,18 +150,18 @@ image_build = {
|
||||||
'distro': 'Fedora-22',
|
'distro': 'Fedora-22',
|
||||||
'disk_size': 5,
|
'disk_size': 5,
|
||||||
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/',
|
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
|
||||||
'repo': [
|
'repo': [
|
||||||
'https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
|
||||||
'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
|
||||||
],
|
],
|
||||||
'subvariant': 'Container_Base'
|
'subvariant': 'Container_Base'
|
||||||
},
|
},
|
||||||
'factory-parameters': {
|
'factory-parameters': {
|
||||||
'dockerversion': "1.10.1",
|
'dockerversion': "1.10.1",
|
||||||
'docker_cmd': '[ "/bin/bash" ]',
|
'docker_cmd': '[ "/bin/bash" ]',
|
||||||
'docker_env': '[ "DISTTAG=f39container", "FGC=f39", "container=oci" ]',
|
'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
|
||||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "39"}',
|
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -172,18 +172,18 @@ image_build = {
|
||||||
'distro': 'Fedora-22',
|
'distro': 'Fedora-22',
|
||||||
'disk_size': 5,
|
'disk_size': 5,
|
||||||
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/',
|
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
|
||||||
'repo': [
|
'repo': [
|
||||||
'https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
|
||||||
'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
|
||||||
],
|
],
|
||||||
'subvariant': 'Container_Minimal_Base',
|
'subvariant': 'Container_Minimal_Base',
|
||||||
},
|
},
|
||||||
'factory-parameters': {
|
'factory-parameters': {
|
||||||
'dockerversion': "1.10.1",
|
'dockerversion': "1.10.1",
|
||||||
'docker_cmd': '[ "/bin/bash" ]',
|
'docker_cmd': '[ "/bin/bash" ]',
|
||||||
'docker_env': '[ "DISTTAG=f39container", "FGC=f39", "container=oci" ]',
|
'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
|
||||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "39"}',
|
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -194,18 +194,18 @@ image_build = {
|
||||||
'distro': 'Fedora-22',
|
'distro': 'Fedora-22',
|
||||||
'disk_size': 5,
|
'disk_size': 5,
|
||||||
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/',
|
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
|
||||||
'repo': [
|
'repo': [
|
||||||
'https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
|
||||||
'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/'
|
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
|
||||||
],
|
],
|
||||||
'subvariant': 'Container_Toolbox',
|
'subvariant': 'Container_Toolbox',
|
||||||
},
|
},
|
||||||
'factory-parameters': {
|
'factory-parameters': {
|
||||||
'dockerversion': "1.10.1",
|
'dockerversion': "1.10.1",
|
||||||
'docker_cmd': '[ "/bin/bash" ]',
|
'docker_cmd': '[ "/bin/bash" ]',
|
||||||
'docker_env': '[ "DISTTAG=f39container", "FGC=f39", "container=oci" ]',
|
'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
|
||||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "39"}',
|
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
34
fedora.conf
34
fedora.conf
|
@ -18,7 +18,7 @@ comps_file = {
|
||||||
}
|
}
|
||||||
|
|
||||||
variants_file='variants-fedora.xml'
|
variants_file='variants-fedora.xml'
|
||||||
sigkeys = ['18B8e74c']
|
sigkeys = ['a15B79cc']
|
||||||
|
|
||||||
# limit tree variants
|
# limit tree variants
|
||||||
# if undefined, all variants from variants.xml will be included
|
# if undefined, all variants from variants.xml will be included
|
||||||
|
@ -35,7 +35,7 @@ pkgset_source = 'koji' # koji, repos
|
||||||
# pkgset_repos = {}
|
# pkgset_repos = {}
|
||||||
|
|
||||||
# PKGSET - KOJI
|
# PKGSET - KOJI
|
||||||
pkgset_koji_tag = 'f39'
|
pkgset_koji_tag = 'f40'
|
||||||
pkgset_koji_inherit = False
|
pkgset_koji_inherit = False
|
||||||
|
|
||||||
# GATHER
|
# GATHER
|
||||||
|
@ -201,7 +201,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 = 'f39'
|
global_target = 'f40'
|
||||||
|
|
||||||
image_build = {
|
image_build = {
|
||||||
'^Container$': [
|
'^Container$': [
|
||||||
|
@ -221,8 +221,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=f39container", "FGC=f39", "container=oci" ]',
|
'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
|
||||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "39"}',
|
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -241,8 +241,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=f39container", "FGC=f39", "container=oci" ]',
|
'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
|
||||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "98"}',
|
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -261,8 +261,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=f39container", "FGC=f39", "container=oci" ]',
|
'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
|
||||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "39"}',
|
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
@ -793,7 +793,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-39-primary",
|
"ostree_oskey=fedora-40-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",
|
||||||
|
@ -820,7 +820,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-39-primary",
|
"ostree_oskey=fedora-40-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",
|
||||||
|
@ -847,7 +847,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-39-primary",
|
"ostree_oskey=fedora-40-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",
|
||||||
|
@ -876,7 +876,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-39-primary",
|
"ostree_oskey=fedora-40-primary",
|
||||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||||
"ostree_install_ref=fedora/rawhide/x86_64/kinoite",
|
"ostree_install_ref=fedora/rawhide/x86_64/kinoite",
|
||||||
"ostree_update_ref=fedora/rawhide/x86_64/kinoite",
|
"ostree_update_ref=fedora/rawhide/x86_64/kinoite",
|
||||||
|
@ -902,7 +902,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-39-primary",
|
"ostree_oskey=fedora-40-primary",
|
||||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||||
"ostree_install_ref=fedora/rawhide/ppc64le/kinoite",
|
"ostree_install_ref=fedora/rawhide/ppc64le/kinoite",
|
||||||
"ostree_update_ref=fedora/rawhide/ppc64le/kinoite",
|
"ostree_update_ref=fedora/rawhide/ppc64le/kinoite",
|
||||||
|
@ -928,7 +928,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-39-primary",
|
"ostree_oskey=fedora-40-primary",
|
||||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||||
"ostree_install_ref=fedora/rawhide/aarch64/kinoite",
|
"ostree_install_ref=fedora/rawhide/aarch64/kinoite",
|
||||||
"ostree_update_ref=fedora/rawhide/aarch64/kinoite",
|
"ostree_update_ref=fedora/rawhide/aarch64/kinoite",
|
||||||
|
@ -956,7 +956,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-39-primary",
|
"ostree_oskey=fedora-40-primary",
|
||||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||||
"ostree_install_ref=fedora/rawhide/x86_64/sericea",
|
"ostree_install_ref=fedora/rawhide/x86_64/sericea",
|
||||||
"ostree_update_ref=fedora/rawhide/x86_64/sericea",
|
"ostree_update_ref=fedora/rawhide/x86_64/sericea",
|
||||||
|
@ -984,7 +984,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-39-primary",
|
"ostree_oskey=fedora-40-primary",
|
||||||
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
|
||||||
"ostree_install_ref=fedora/rawhide/x86_64/onyx",
|
"ostree_install_ref=fedora/rawhide/x86_64/onyx",
|
||||||
"ostree_update_ref=fedora/rawhide/x86_64/onyx",
|
"ostree_update_ref=fedora/rawhide/x86_64/onyx",
|
||||||
|
|
|
@ -217,8 +217,8 @@ umask $old_umask
|
||||||
# Push rawhide ostree base container image to fedora registry
|
# Push rawhide ostree base container image to fedora registry
|
||||||
pushd ./releng
|
pushd ./releng
|
||||||
pushd ./scripts
|
pushd ./scripts
|
||||||
./sync-latest-container-base-image.sh 39
|
./sync-latest-container-base-image.sh 40
|
||||||
./sync-ostree-base-containers.sh 39
|
./sync-ostree-base-containers.sh 40
|
||||||
popd
|
popd
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue