Update repo to remove f39/39 references
Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
This commit is contained in:
Samyak Jain
humaton
parent
fed3cea474
commit
cf9f39d1e9
|
|
@ -13,9 +13,9 @@ DEST=$(pwd)
|
|||
DATE=$(date "+%Y%m%d")
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-Cloud"
|
||||
RELEASE="35"
|
||||
RELEASE_TITLE="35"
|
||||
COMPSFILE="comps-f35.xml"
|
||||
RELEASE="39"
|
||||
RELEASE_TITLE="39"
|
||||
COMPSFILE="comps-f39.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="test-reports@lists.fedoraproject.org"
|
||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ DEST=$(pwd)
|
|||
DATE=$(date "+%Y%m%d")
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-Docker"
|
||||
RELEASE="35"
|
||||
RELEASE_TITLE="35"
|
||||
COMPSFILE="comps-f35.xml"
|
||||
RELEASE="39"
|
||||
RELEASE_TITLE="39"
|
||||
COMPSFILE="comps-f39.xml"
|
||||
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
||||
TOMAIL="test-reports@lists.fedoraproject.org"
|
||||
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@ from multilib import *
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora-Cloud'
|
||||
release_short = 'Fedora-Cloud'
|
||||
release_version = '38'
|
||||
release_version = '39'
|
||||
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/fedora-comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-f38.xml',
|
||||
'command': 'make comps-f38.xml'
|
||||
'file': 'comps-f39.xml',
|
||||
'command': 'make comps-f39.xml'
|
||||
}
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['5323552A'] # None = unsigned
|
||||
|
|
@ -23,7 +23,7 @@ sigkeys = ['5323552A'] # None = unsigned
|
|||
# if undefined, all variants from variants.xml will be included
|
||||
tree_variants = ['Cloud']
|
||||
# PKGSET
|
||||
pkgset_koji_tag = 'f38-updates'
|
||||
pkgset_koji_tag = 'f39-updates'
|
||||
pkgset_koji_inherit = True
|
||||
# GATHER
|
||||
gather_method = 'deps'
|
||||
|
|
@ -141,19 +141,19 @@ image_build = {
|
|||
'image-build': {
|
||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
|
||||
'name': 'Fedora-Cloud-Base',
|
||||
'target': 'f38',
|
||||
'version': '38',
|
||||
'target': 'f39',
|
||||
'version': '39',
|
||||
'release': None,
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f38',
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f39',
|
||||
'kickstart': 'fedora-cloud-base.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 4,
|
||||
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||
'repo': [
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f38-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/'
|
||||
],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/',
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/',
|
||||
'subvariant': 'Cloud_Base'
|
||||
}
|
||||
},
|
||||
|
|
@ -161,19 +161,19 @@ image_build = {
|
|||
'image-build': {
|
||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
|
||||
'name': 'Fedora-Cloud-Base-Vagrant',
|
||||
'target': 'f38',
|
||||
'version': '38',
|
||||
'target': 'f39',
|
||||
'version': '39',
|
||||
'release': None,
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f38',
|
||||
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f39',
|
||||
'kickstart': 'fedora-cloud-base-vagrant.ks',
|
||||
'distro': 'Fedora-22',
|
||||
'disk_size': 40,
|
||||
'arches': ['x86_64'],
|
||||
'repo': [
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f38-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/'
|
||||
],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/',
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/',
|
||||
'subvariant': 'Cloud_Base',
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,22 +6,22 @@ from multilib import *
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora-Container'
|
||||
release_short = 'Fedora-Container'
|
||||
release_version = '35'
|
||||
release_version = '39'
|
||||
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/fedora-comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-f35.xml',
|
||||
'command': 'make comps-f35.xml'
|
||||
'file': 'comps-f39.xml',
|
||||
'command': 'make comps-f39.xml'
|
||||
}
|
||||
sigkeys = ['5323552A'] # None = unsigned
|
||||
# limit tree variants
|
||||
# if undefined, all variants from variants.xml will be included
|
||||
tree_variants = ['Container']
|
||||
# PKGSET
|
||||
pkgset_koji_tag = 'f35-updates'
|
||||
pkgset_koji_tag = 'f39-updates'
|
||||
pkgset_koji_inherit = True
|
||||
# GATHER
|
||||
gather_method = 'deps'
|
||||
|
|
@ -135,10 +135,10 @@ image_volid_formats = [
|
|||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35'
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f39'
|
||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||
global_version = '35'
|
||||
global_target = 'f35'
|
||||
global_version = '39'
|
||||
global_target = 'f39'
|
||||
|
||||
image_build = {
|
||||
'^Container$': [
|
||||
|
|
@ -150,18 +150,18 @@ image_build = {
|
|||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/',
|
||||
'repo': [
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/'
|
||||
],
|
||||
'subvariant': 'Container_Base'
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}',
|
||||
'docker_env': '[ "DISTTAG=f39container", "FGC=f39", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "39"}',
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -172,18 +172,18 @@ image_build = {
|
|||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/',
|
||||
'repo': [
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/39/latest-Fedora-39/compose/Everything/$arch/os/'
|
||||
],
|
||||
'subvariant': 'Container_Minimal_Base',
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}',
|
||||
'docker_env': '[ "DISTTAG=f39container", "FGC=f39", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "39"}',
|
||||
},
|
||||
}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -791,6 +791,7 @@ ostree_installer = [
|
|||
# using registry-no-cdn avoids redirects to the CDN;
|
||||
# needed because of network restrictions on koji runroot
|
||||
"flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
|
||||
# keeping them on the stable release until the flatpak sig confirms the next update
|
||||
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f38 app/org.gnome.baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.Cheese/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Connections/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.Extensions/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.TextEditor/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.fedoraproject.MediaWriter/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Weather/x86_64/stable",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
|
|
@ -844,6 +845,7 @@ ostree_installer = [
|
|||
# using registry-no-cdn avoids redirects to the CDN;
|
||||
# needed because of network restrictions on koji runroot
|
||||
"flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
|
||||
# keeping them on the stable release until the flatpak sig confirms the next update
|
||||
"flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f38 app/org.gnome.baobab/aarch64/stable app/org.gnome.Calculator/aarch64/stable app/org.gnome.Calendar/aarch64/stable app/org.gnome.Characters/aarch64/stable app/org.gnome.Cheese/aarch64/stable app/org.gnome.clocks/aarch64/stable app/org.gnome.Connections/aarch64/stable app/org.gnome.Contacts/aarch64/stable app/org.gnome.eog/aarch64/stable app/org.gnome.Evince/aarch64/stable app/org.gnome.Extensions/aarch64/stable app/org.gnome.font-viewer/aarch64/stable app/org.gnome.TextEditor/aarch64/stable app/org.gnome.Logs/aarch64/stable app/org.gnome.Maps/aarch64/stable app/org.fedoraproject.MediaWriter/aarch64/stable app/org.gnome.NautilusPreviewer/aarch64/stable app/org.gnome.Weather/aarch64/stable",
|
||||
],
|
||||
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
||||
|
|
|
|||
Loading…
Reference in New Issue