mirror of
https://git.rockylinux.org/rocky/pungi-rocky.git
synced 2024-10-11 01:35:08 +00:00
prepare for 8.9
This commit is contained in:
parent
db59c64b1d
commit
07f7398613
@ -43,7 +43,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 4
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
@ -72,7 +72,7 @@ image_build = {
|
||||
"format": [("docker", "tar.gz")],
|
||||
"name": "Rocky-8-Container",
|
||||
"target": "image-rocky-8",
|
||||
"version": "8.8",
|
||||
"version": "8.9",
|
||||
"ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#HEAD",
|
||||
"kickstart": "Rocky-8-Container.ks",
|
||||
"ksversion": "F26",
|
||||
@ -80,9 +80,9 @@ image_build = {
|
||||
"disk-size": "10",
|
||||
"arches": ["x86_64","ppc64le","aarch64"],
|
||||
"repo": [
|
||||
'http://dl.rockylinux.org/pub/rocky/8.8/BaseOS/$arch/os',
|
||||
'http://dl.rockylinux.org/pub/rocky/8.9/BaseOS/$arch/os',
|
||||
],
|
||||
"install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.8/BaseOS/$arch/os',
|
||||
"install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.9/BaseOS/$arch/os',
|
||||
"failable": ["ppc64le","aarch64"],
|
||||
},
|
||||
"factory-parameters": {
|
||||
|
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
hashed_directories = True
|
||||
|
||||
check_deps = False
|
||||
|
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
hashed_directories = True
|
||||
|
||||
filter_packages = [
|
||||
|
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
hashed_directories = True
|
||||
|
||||
filter_packages = [
|
||||
|
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
hashed_directories = True
|
||||
|
||||
filter_packages = [
|
||||
|
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
hashed_directories = True
|
||||
|
||||
filter_packages = [
|
||||
|
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
hashed_directories = True
|
||||
|
||||
filter_packages = [
|
||||
|
@ -5,15 +5,15 @@ from common/include-excludes import *
|
||||
# PRODUCT INFO
|
||||
release_name = "Rocky Linux"
|
||||
release_short = "Rocky"
|
||||
release_version = "8.8"
|
||||
version = "8.8"
|
||||
release_version = "8.9"
|
||||
version = "8.9"
|
||||
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-rocky-8.8.xml',
|
||||
'file': 'comps-rocky-8.9.xml',
|
||||
}
|
||||
|
||||
#link_type = 'hardlink-or-copy'
|
||||
@ -22,7 +22,7 @@ link_type = 'copy'
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
|
||||
'branch': 'r8.8',
|
||||
'branch': 'r8.9',
|
||||
'dir': '.',
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ multilib = [
|
||||
|
||||
variants_file = 'variants.xml'
|
||||
sigkeys = ['6D745A60']
|
||||
# Change to true for 8.8
|
||||
# Change to true for 8.9
|
||||
hashed_directories = True
|
||||
|
||||
tree_arches = ['aarch64', 'i386', 'x86_64']
|
||||
@ -82,7 +82,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
@ -109,12 +109,12 @@ buildinstall_skip = [
|
||||
]
|
||||
|
||||
image_name_format = {
|
||||
"^BaseOS$": "{release_short}-8.8-BETA-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.8-BETA-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.8-BETA-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^BaseOS$": "{release_short}-8.9-BETA-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.9-BETA-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.9-BETA-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
}
|
||||
|
||||
image_volid_formats = [ '{release_short}-8.8-BETA-{arch}-{disc_type}', ]
|
||||
image_volid_formats = [ '{release_short}-8.9-BETA-{arch}-{disc_type}', ]
|
||||
|
||||
# CREATEISO
|
||||
create_optional_isos = False
|
||||
@ -129,12 +129,12 @@ createiso_skip = [
|
||||
extra_isos = {
|
||||
"BaseOS": [{
|
||||
"include_variants": ["AppStream"],
|
||||
"filename": "{release_short}-8.8-BETA-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"filename": "{release_short}-8.9-BETA-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"skip_src": True,
|
||||
}],
|
||||
"Minimal": [{
|
||||
"include_variants": ["BaseOS"],
|
||||
"filename": "{release_short}-8.8-BETA-{arch}-minimal{suffix}",
|
||||
"filename": "{release_short}-8.9-BETA-{arch}-minimal{suffix}",
|
||||
"skip_src": True,
|
||||
}]
|
||||
}
|
||||
|
@ -14,7 +14,7 @@ skip_phases = ['buildinstall','productimg','createiso','extra_isos','extra_files
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-rocky-8.8.xml',
|
||||
'file': 'comps-rocky-8.9.xml',
|
||||
}
|
||||
|
||||
#link_type = 'hardlink-or-copy'
|
||||
@ -23,7 +23,7 @@ link_type = 'copy'
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
|
||||
'branch': 'r8.8',
|
||||
'branch': 'r8.9',
|
||||
'dir': '.',
|
||||
}
|
||||
|
||||
|
@ -6,14 +6,14 @@ from common/include-excludes import *
|
||||
release_name = "Rocky Linux"
|
||||
release_short = "Rocky-i686"
|
||||
release_version = "8"
|
||||
version = "8.8"
|
||||
version = "8.9"
|
||||
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-rocky-8.8.xml',
|
||||
'file': 'comps-rocky-8.9.xml',
|
||||
}
|
||||
|
||||
#link_type = 'hardlink-or-copy'
|
||||
@ -22,7 +22,7 @@ link_type = 'copy'
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
|
||||
'branch': 'r8.8',
|
||||
'branch': 'r8.9',
|
||||
'dir': '.',
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ multilib = [
|
||||
|
||||
variants_file = 'variants-i686.xml'
|
||||
sigkeys = ['6D745A60']
|
||||
# Change to true for 8.8
|
||||
# Change to true for 8.9
|
||||
hashed_directories = False
|
||||
|
||||
tree_arches = ['i686']
|
||||
@ -82,7 +82,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
@ -110,12 +110,12 @@ buildinstall_skip = [
|
||||
]
|
||||
|
||||
image_name_format = {
|
||||
"^BaseOS$": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.8-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^BaseOS$": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.9-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
}
|
||||
|
||||
image_volid_formats = [ '{release_short}-8.8-{arch}-{disc_type}', ]
|
||||
image_volid_formats = [ '{release_short}-8.9-{arch}-{disc_type}', ]
|
||||
|
||||
# CREATEISO
|
||||
create_optional_isos = False
|
||||
@ -130,12 +130,12 @@ createiso_skip = [
|
||||
extra_isos = {
|
||||
"BaseOS": [{
|
||||
"include_variants": ["AppStream"],
|
||||
"filename": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"filename": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"skip_src": True,
|
||||
}],
|
||||
"Minimal": [{
|
||||
"include_variants": ["BaseOS"],
|
||||
"filename": "{release_short}-8.8-{arch}-minimal{suffix}",
|
||||
"filename": "{release_short}-8.9-{arch}-minimal{suffix}",
|
||||
"skip_src": True,
|
||||
}]
|
||||
}
|
||||
|
@ -5,15 +5,15 @@ from common/include-excludes import *
|
||||
# PRODUCT INFO
|
||||
release_name = "Rocky Linux"
|
||||
release_short = "Rocky"
|
||||
release_version = "8.8"
|
||||
version = "8.8"
|
||||
release_version = "8.9"
|
||||
version = "8.9"
|
||||
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-rocky-8.8.xml',
|
||||
'file': 'comps-rocky-8.9.xml',
|
||||
}
|
||||
|
||||
#link_type = 'hardlink-or-copy'
|
||||
@ -22,7 +22,7 @@ link_type = 'copy'
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
|
||||
'branch': 'r8.8',
|
||||
'branch': 'r8.9',
|
||||
'dir': '.',
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ multilib = [
|
||||
|
||||
variants_file = 'variants.xml'
|
||||
sigkeys = ['6D745A60']
|
||||
# Change to true for 8.8
|
||||
# Change to true for 8.9
|
||||
hashed_directories = True
|
||||
|
||||
tree_arches = ['aarch64', 'i386', 'x86_64']
|
||||
@ -82,7 +82,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
@ -108,12 +108,12 @@ buildinstall_skip = [
|
||||
]
|
||||
|
||||
image_name_format = {
|
||||
"^BaseOS$": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.8-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^BaseOS$": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.9-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
}
|
||||
|
||||
image_volid_formats = [ '{release_short}-8.8-{arch}-{disc_type}', ]
|
||||
image_volid_formats = [ '{release_short}-8.9-{arch}-{disc_type}', ]
|
||||
|
||||
# CREATEISO
|
||||
create_optional_isos = False
|
||||
@ -128,12 +128,12 @@ createiso_skip = [
|
||||
extra_isos = {
|
||||
"BaseOS": [{
|
||||
"include_variants": ["AppStream"],
|
||||
"filename": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"filename": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"skip_src": True,
|
||||
}],
|
||||
"Minimal": [{
|
||||
"include_variants": ["BaseOS"],
|
||||
"filename": "{release_short}-8.8-{arch}-minimal{suffix}",
|
||||
"filename": "{release_short}-8.9-{arch}-minimal{suffix}",
|
||||
"skip_src": True,
|
||||
}]
|
||||
}
|
||||
|
@ -5,15 +5,15 @@ from common/include-excludes import *
|
||||
# PRODUCT INFO
|
||||
release_name = "Rocky Linux"
|
||||
release_short = "Rocky"
|
||||
release_version = "8.8"
|
||||
version = "8.8"
|
||||
release_version = "8.9"
|
||||
version = "8.9"
|
||||
|
||||
# GENERAL SETTINGS
|
||||
comps_file = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-rocky-8.8.xml',
|
||||
'file': 'comps-rocky-8.9.xml',
|
||||
}
|
||||
|
||||
#link_type = 'hardlink-or-copy'
|
||||
@ -22,7 +22,7 @@ link_type = 'copy'
|
||||
module_defaults_dir = {
|
||||
'scm': 'git',
|
||||
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
|
||||
'branch': 'r8.8',
|
||||
'branch': 'r8.9',
|
||||
'dir': '.',
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ multilib = [
|
||||
|
||||
variants_file = 'variants.xml'
|
||||
sigkeys = ['6D745A60']
|
||||
# Change to true for 8.8
|
||||
# Change to true for 8.9
|
||||
hashed_directories = True
|
||||
|
||||
tree_arches = ['aarch64', 'i386', 'x86_64']
|
||||
@ -82,7 +82,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
|
||||
# CHECKSUMS
|
||||
media_checksums = ['sha256']
|
||||
@ -114,7 +114,7 @@ image_name_format = {
|
||||
".*": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
}
|
||||
|
||||
image_volid_formats = [ '{release_short}-8.8-LH-{arch}-{disc_type}', ]
|
||||
image_volid_formats = [ '{release_short}-8.9-LH-{arch}-{disc_type}', ]
|
||||
|
||||
# CREATEISO
|
||||
create_optional_isos = False
|
||||
|
@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
hashed_directories = True
|
||||
|
||||
filter_packages = [
|
||||
|
@ -23,7 +23,7 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
hashed_directories = True
|
||||
|
||||
pkgset_koji_tag='dist-rocky8-plus-compose'
|
||||
|
@ -26,6 +26,6 @@ image_name_format = {
|
||||
".*": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
}
|
||||
|
||||
image_volid_formats = [ '{release_short}-8.8-LH-{arch}-{disc_type}', ]
|
||||
image_volid_formats = [ '{release_short}-8.9-LH-{arch}-{disc_type}', ]
|
||||
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
# '^Workstation$': [
|
||||
# {
|
||||
# 'name': 'Rocky-Workstation-8',
|
||||
# 'version': '8.8',
|
||||
# 'version': '8.9',
|
||||
# 'arches': ['x86_64'],
|
||||
# 'kickstart': 'Rocky-8-Workstation.ks',
|
||||
# 'repo': ['BaseOS', 'AppStream', 'PowerTools', 'extras'],
|
||||
@ -18,7 +18,7 @@ image_build = {
|
||||
"format": [("qcow2", "qcow2")],
|
||||
"name": "Rocky-8-GenericCloud",
|
||||
"subvariant": "generic",
|
||||
"version": "8.8",
|
||||
"version": "8.9",
|
||||
"release": "!RELEASE_FROM_DATE_RESPIN"
|
||||
"target": "image-rocky-8",
|
||||
"ksurl": "git+https://git.resf.org/sig_core/kickstarts.git?#origin/r8",
|
||||
@ -40,7 +40,7 @@ image_build = {
|
||||
"format": [("raw-xz", "raw.xz")],
|
||||
"name": "Rocky-8-EC2",
|
||||
"subvariant": "ec2",
|
||||
"version": "8.8",
|
||||
"version": "8.9",
|
||||
"release": "!RELEASE_FROM_DATE_RESPIN"
|
||||
"target": "image-rocky-8",
|
||||
"ksurl": "git+https://git.resf.org/sig_core/kickstarts.git?#origin/r8",
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
RELEASE_NAME = 'Rocky Linux'
|
||||
RELEASE_SHORT = 'Rocky'
|
||||
RELEASE_VERSION = '8.8'
|
||||
VERSION = '8.8'
|
||||
RELEASE_VERSION = '8.9'
|
||||
VERSION = '8.9'
|
||||
|
||||
PKGSET_KOJI_TAG = 'dist-rocky8-compose'
|
||||
PKGSET_KOJI_MODULE_TAG = 'dist-rocky8-module-compose'
|
||||
@ -17,7 +17,7 @@ COMPS_FILE = 'comps-rocky-%s.xml' % RELEASE_VERSION
|
||||
COMPS_COMMAND = ''
|
||||
|
||||
MODULE_DEFAULTS_REPO = 'https://git.rockylinux.org/rocky/rocky-module-defaults.git'
|
||||
MODULE_DEFAULTS_BRANCH = 'r8.8'
|
||||
MODULE_DEFAULTS_BRANCH = 'r8.9'
|
||||
|
||||
VARIANTS_SCM = 'git'
|
||||
VARIANTS_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git'
|
||||
|
@ -26,6 +26,6 @@ image_name_format = {
|
||||
".*": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
}
|
||||
|
||||
image_volid_formats = [ '{release_short}-8.8-LH-{arch}-{disc_type}', ]
|
||||
image_volid_formats = [ '{release_short}-8.9-LH-{arch}-{disc_type}', ]
|
||||
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
MAJOR="8"
|
||||
REVISION="8.8"
|
||||
REVISION="8.9"
|
||||
FROMMAIL="Compose Tracker <releng@rockylinux.org>"
|
||||
TOMAIL="releng@rockylinux.org"
|
||||
|
||||
|
@ -7,7 +7,7 @@ CONFIG=/etc/pungi-prod/extras.conf
|
||||
# Unused for now
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
|
||||
SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
|
||||
LABEL="--production --label RC-8.8"
|
||||
LABEL="--production --label RC-8.9"
|
||||
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $SKIP $LABEL"
|
||||
|
||||
if [ -z "$COMPOSE_ID" ]; then
|
||||
|
@ -8,7 +8,7 @@ CONFIG=/etc/pungi-prod/r8-i686-updates.conf
|
||||
# Unused for now
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
|
||||
SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
|
||||
LABEL="--production --label RC-8.8"
|
||||
LABEL="--production --label RC-8.9"
|
||||
|
||||
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL"
|
||||
#COMPOSE_ID="Rocky-8-20210625.n.0"
|
||||
|
@ -7,7 +7,7 @@ CONFIG=/etc/pungi-prod/plus.conf
|
||||
# Unused for now
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
|
||||
SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
|
||||
LABEL="--production --label RC-8.8"
|
||||
LABEL="--production --label RC-8.9"
|
||||
|
||||
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $SKIP $LABEL"
|
||||
|
||||
|
@ -8,7 +8,7 @@ CONFIG=/etc/pungi-prod/rocky-updates.conf
|
||||
# Unused for now
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
|
||||
SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
|
||||
LABEL="--production --label RC-8.8"
|
||||
LABEL="--production --label RC-8.9"
|
||||
|
||||
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL"
|
||||
#COMPOSE_ID="Rocky-8-20210625.n.0"
|
||||
|
@ -10,12 +10,12 @@ lorax_options = [
|
||||
]
|
||||
|
||||
image_name_format = {
|
||||
"^BaseOS$": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.8-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^BaseOS$": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"^Minimal$": "{release_short}-8.9-{arch}-minimal{suffix}",
|
||||
".*": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
}
|
||||
|
||||
image_volid_formats = [ '{release_short}-8.8-{arch}-{disc_type}', ]
|
||||
image_volid_formats = [ '{release_short}-8.9-{arch}-{disc_type}', ]
|
||||
|
||||
buildinstall_skip = [
|
||||
("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$", {
|
||||
|
@ -5,4 +5,4 @@ createrepo_checksum = "sha256"
|
||||
createrepo_use_xz = True
|
||||
createrepo_num_threads = 8
|
||||
createrepo_num_workers = 8
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
|
||||
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.9']
|
||||
|
@ -1,12 +1,12 @@
|
||||
extra_isos = {
|
||||
"BaseOS": [{
|
||||
"include_variants": ["AppStream"],
|
||||
"filename": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"filename": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}",
|
||||
"skip_src": True,
|
||||
}],
|
||||
"Minimal": [{
|
||||
"include_variants": ["BaseOS"],
|
||||
"filename": "{release_short}-8.8-{arch}-minimal{suffix}",
|
||||
"filename": "{release_short}-8.9-{arch}-minimal{suffix}",
|
||||
"skip_src": True,
|
||||
}]
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user