sig_core/pungi-rocky
7
0
Fork 0
mirror of https://git.rockylinux.org/rocky/pungi-rocky.git synced 2024-11-22 04:41:33 +00:00
Code Issues Projects Releases Wiki Activity

start prepping for 8.8

Browse Source
This commit is contained in:
Louis Abel 2022-11-08 20:47:33 -07:00
parent 5e5b279d7a
commit 8f69c91ffa
Signed by: label
GPG Key ID: B37E62D143879B36
27 changed files with 56 additions and 27481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
advanced-virt.conf
View File

@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 8 createrepo_num_workers = 8
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
hashed_directories = True hashed_directories = True
filter_packages = [ filter_packages = [

10
container.conf
View File

@ -26,7 +26,7 @@ pkgset_koji_inherit = False
pkgset_koji_module_tag = "modular-updates-candidate" pkgset_koji_module_tag = "modular-updates-candidate"
# GATHER # GATHER
gather_prepopulate = "rocky-packages.json" gather_prepopulate = "prepopulate.json"
gather_method = { gather_method = {
"^(?!(AppStream|PowerTools)).*$":{ "^(?!(AppStream|PowerTools)).*$":{
@ -43,7 +43,7 @@ createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 4 createrepo_num_workers = 4
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
# CHECKSUMS # CHECKSUMS
media_checksums = ['sha256'] media_checksums = ['sha256']
@ -72,7 +72,7 @@ image_build = {
"format": [("docker", "tar.gz")], "format": [("docker", "tar.gz")],
"name": "Rocky-8-Container", "name": "Rocky-8-Container",
"target": "image-rocky-8", "target": "image-rocky-8",
"version": "8.7", "version": "8.8",
"ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#HEAD", "ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#HEAD",
"kickstart": "Rocky-8-Container.ks", "kickstart": "Rocky-8-Container.ks",
"ksversion": "F26", "ksversion": "F26",
@ -80,9 +80,9 @@ image_build = {
"disk-size": "10", "disk-size": "10",
"arches": ["x86_64","ppc64le","aarch64"], "arches": ["x86_64","ppc64le","aarch64"],
"repo": [ "repo": [
'http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$arch/os', 'http://dl.rockylinux.org/pub/rocky/8.8/BaseOS/$arch/os',
], ],
"install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$arch/os', "install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.8/BaseOS/$arch/os',
"failable": ["ppc64le","aarch64"], "failable": ["ppc64le","aarch64"],
}, },
"factory-parameters": { "factory-parameters": {

2
extras.conf
View File

@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 8 createrepo_num_workers = 8
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
hashed_directories = True hashed_directories = True
check_deps = False check_deps = False

2
gluster9.conf
View File

@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 8 createrepo_num_workers = 8
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
hashed_directories = True hashed_directories = True
filter_packages = [ filter_packages = [

16
images-cloud.conf
View File

@ -5,7 +5,7 @@ image_build = {
"format": [("qcow2", "qcow2")], "format": [("qcow2", "qcow2")],
"name": "Rocky-8-GenericCloud", "name": "Rocky-8-GenericCloud",
"subvariant": "generic", "subvariant": "generic",
"version": "8.7", "version": "8.8",
"release": "!RELEASE_FROM_DATE_RESPIN" "release": "!RELEASE_FROM_DATE_RESPIN"
"target": "image-rocky-8", "target": "image-rocky-8",
"ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#b1c99d8584d04fd58bd31e7d5f1d851b6b151350", "ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#b1c99d8584d04fd58bd31e7d5f1d851b6b151350",
@ -15,10 +15,10 @@ image_build = {
"disk-size": "8", "disk-size": "8",
"arches": ["x86_64","aarch64"], "arches": ["x86_64","aarch64"],
"repo": [ "repo": [
"http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$arch/os/", "http://dl.rockylinux.org/stg/rocky/8.8/BaseOS/$arch/os/",
"http://dl.rockylinux.org/stg/rocky/8.7/AppStream/$arch/os/", "http://dl.rockylinux.org/stg/rocky/8.8/AppStream/$arch/os/",
], ],
"install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$arch/os/", "install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.8/BaseOS/$arch/os/",
}, },
"factory-parameters": { "factory-parameters": {
"generate_icicle": False, "generate_icicle": False,
@ -29,7 +29,7 @@ image_build = {
"format": [("qcow2", "qcow2")], "format": [("qcow2", "qcow2")],
"name": "Rocky-8-ec2", "name": "Rocky-8-ec2",
"subvariant": "ec2", "subvariant": "ec2",
"version": "8.7", "version": "8.8",
"release": "!RELEASE_FROM_DATE_RESPIN" "release": "!RELEASE_FROM_DATE_RESPIN"
"target": "image-rocky-8", "target": "image-rocky-8",
"ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#b1c99d8584d04fd58bd31e7d5f1d851b6b151350", "ksurl": "git+https://git.rockylinux.org/rocky/kickstarts.git?#b1c99d8584d04fd58bd31e7d5f1d851b6b151350",
@ -39,10 +39,10 @@ image_build = {
"disk-size": "8", "disk-size": "8",
"arches": ["x86_64"], "arches": ["x86_64"],
"repo": [ "repo": [
"http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$arch/os/", "http://dl.rockylinux.org/stg/rocky/8.8/BaseOS/$arch/os/",
"http://dl.rockylinux.org/stg/rocky/8.7/AppStream/$arch/os/", "http://dl.rockylinux.org/stg/rocky/8.8/AppStream/$arch/os/",
], ],
"install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$arch/os/", "install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.8/BaseOS/$arch/os/",
}, },
"factory-parameters": { "factory-parameters": {
"generate_icicle": False, "generate_icicle": False,

2
kernel.conf
View File

@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 8 createrepo_num_workers = 8
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
hashed_directories = True hashed_directories = True
filter_packages = [ filter_packages = [

2
kmod.conf
View File

@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 8 createrepo_num_workers = 8
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
hashed_directories = True hashed_directories = True
filter_packages = [ filter_packages = [

2
nfv.conf
View File

@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 8 createrepo_num_workers = 8
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
hashed_directories = True hashed_directories = True
filter_packages = [ filter_packages = [

2
plus.conf
View File

@ -23,7 +23,7 @@ createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 8 createrepo_num_workers = 8
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
hashed_directories = True hashed_directories = True
pkgset_koji_tag='dist-rocky8-plus-compose' pkgset_koji_tag='dist-rocky8-plus-compose'

0
rocky-packages.json → prepopulate.json
View File

2
r8-cloud.conf
View File

@ -27,7 +27,7 @@ pkgset_koji_inherit = False
pkgset_koji_module_tag = "modular-updates-candidate" pkgset_koji_module_tag = "modular-updates-candidate"
# GATHER # GATHER
gather_prepopulate = "rocky-packages.json" gather_prepopulate = "prepopulate.json"
gather_method = { gather_method = {
"^(?!(AppStream|PowerTools)).*$":{ "^(?!(AppStream|PowerTools)).*$":{

6
r8-devel.conf
View File

@ -14,7 +14,7 @@ skip_phases = ['buildinstall','productimg','createiso','extra_isos','extra_files
'scm': 'git', 'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/comps.git', 'repo': 'https://git.rockylinux.org/rocky/comps.git',
'branch': 'main', 'branch': 'main',
'file': 'comps-rocky-8.7.xml', 'file': 'comps-rocky-8.8.xml',
} }
#link_type = 'hardlink-or-copy' #link_type = 'hardlink-or-copy'
@ -23,7 +23,7 @@ link_type = 'copy'
module_defaults_dir = { module_defaults_dir = {
'scm': 'git', 'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git', 'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
'branch': 'r8.7', 'branch': 'r8.8',
'dir': '.', 'dir': '.',
} }
@ -52,7 +52,7 @@ pkgset_koji_module_tag = "modular-updates-candidate"
filter_system_release_packages = False filter_system_release_packages = False
# GATHER # GATHER
gather_prepopulate = "rocky-packages.json" gather_prepopulate = "prepopulate.json"
gather_method = { gather_method = {
"^(?!(AppStream|PowerTools)).*$":{ "^(?!(AppStream|PowerTools)).*$":{

6
r8-i686-devel.conf
View File

@ -14,7 +14,7 @@ skip_phases = ['buildinstall','productimg','createiso','extra_isos','extra_files
'scm': 'git', 'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/comps.git', 'repo': 'https://git.rockylinux.org/rocky/comps.git',
'branch': 'main', 'branch': 'main',
'file': 'comps-rocky-8.7.xml', 'file': 'comps-rocky-8.8.xml',
} }
#link_type = 'hardlink-or-copy' #link_type = 'hardlink-or-copy'
@ -23,7 +23,7 @@ link_type = 'copy'
module_defaults_dir = { module_defaults_dir = {
'scm': 'git', 'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git', 'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
'branch': 'r8.7', 'branch': 'r8.8',
'dir': '.', 'dir': '.',
} }
@ -52,7 +52,7 @@ pkgset_koji_module_tag = "modular-updates-candidate"
filter_system_release_packages = False filter_system_release_packages = False
# GATHER # GATHER
#gather_prepopulate = "rocky-packages.json" #gather_prepopulate = "prepopulate.json"
gather_method = { gather_method = {
"^(?!(AppStream|PowerTools)).*$":{ "^(?!(AppStream|PowerTools)).*$":{

22
r8-i686.conf
View File

@ -6,14 +6,14 @@ from common/include-excludes import *
release_name = "Rocky Linux" release_name = "Rocky Linux"
release_short = "Rocky-i686" release_short = "Rocky-i686"
release_version = "8" release_version = "8"
version = "8.7" version = "8.8"
# GENERAL SETTINGS # GENERAL SETTINGS
comps_file = { comps_file = {
'scm': 'git', 'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/comps.git', 'repo': 'https://git.rockylinux.org/rocky/comps.git',
'branch': 'main', 'branch': 'main',
'file': 'comps-rocky-8.7.xml', 'file': 'comps-rocky-8.8.xml',
} }
#link_type = 'hardlink-or-copy' #link_type = 'hardlink-or-copy'
@ -22,7 +22,7 @@ link_type = 'copy'
module_defaults_dir = { module_defaults_dir = {
'scm': 'git', 'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git', 'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
'branch': 'r8.7', 'branch': 'r8.8',
'dir': '.', 'dir': '.',
} }
@ -34,7 +34,7 @@ multilib = [
variants_file = 'variants-i686.xml' variants_file = 'variants-i686.xml'
sigkeys = ['6D745A60'] sigkeys = ['6D745A60']
# Change to true for 8.7 # Change to true for 8.8
hashed_directories = False hashed_directories = False
tree_arches = ['i686'] tree_arches = ['i686']
@ -82,7 +82,7 @@ createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 8 createrepo_num_workers = 8
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
# CHECKSUMS # CHECKSUMS
media_checksums = ['sha256'] media_checksums = ['sha256']
@ -110,12 +110,12 @@ buildinstall_skip = [
] ]
image_name_format = { image_name_format = {
"^BaseOS$": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", "^BaseOS$": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
"^Minimal$": "{release_short}-8.7-{arch}-minimal{suffix}", "^Minimal$": "{release_short}-8.8-{arch}-minimal{suffix}",
".*": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", ".*": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
} }
image_volid_formats = [ '{release_short}-8.7-{arch}-{disc_type}', ] image_volid_formats = [ '{release_short}-8.8-{arch}-{disc_type}', ]
# CREATEISO # CREATEISO
create_optional_isos = False create_optional_isos = False
@ -130,12 +130,12 @@ createiso_skip = [
extra_isos = { extra_isos = {
"BaseOS": [{ "BaseOS": [{
"include_variants": ["AppStream"], "include_variants": ["AppStream"],
"filename": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", "filename": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
"skip_src": True, "skip_src": True,
}], }],
"Minimal": [{ "Minimal": [{
"include_variants": ["BaseOS"], "include_variants": ["BaseOS"],
"filename": "{release_short}-8.7-{arch}-minimal{suffix}", "filename": "{release_short}-8.8-{arch}-minimal{suffix}",
"skip_src": True, "skip_src": True,
}] }]
} }

24
r8.conf
View File

@ -6,14 +6,14 @@ from common/include-excludes import *
release_name = "Rocky Linux" release_name = "Rocky Linux"
release_short = "Rocky" release_short = "Rocky"
release_version = "8" release_version = "8"
version = "8.7" version = "8.8"
# GENERAL SETTINGS # GENERAL SETTINGS
comps_file = { comps_file = {
'scm': 'git', 'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/comps.git', 'repo': 'https://git.rockylinux.org/rocky/comps.git',
'branch': 'main', 'branch': 'main',
'file': 'comps-rocky-8.7.xml', 'file': 'comps-rocky-8.8.xml',
} }
#link_type = 'hardlink-or-copy' #link_type = 'hardlink-or-copy'
@ -22,7 +22,7 @@ link_type = 'copy'
module_defaults_dir = { module_defaults_dir = {
'scm': 'git', 'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git', 'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
'branch': 'r8.7', 'branch': 'r8.8',
'dir': '.', 'dir': '.',
} }
@ -34,7 +34,7 @@ multilib = [
variants_file = 'variants.xml' variants_file = 'variants.xml'
sigkeys = ['6D745A60'] sigkeys = ['6D745A60']
# Change to true for 8.7 # Change to true for 8.8
hashed_directories = True hashed_directories = True
tree_arches = ['aarch64', 'i386', 'x86_64'] tree_arches = ['aarch64', 'i386', 'x86_64']
@ -60,7 +60,7 @@ filter_system_release_packages = False
createiso_break_hardlinks = True createiso_break_hardlinks = True
# GATHER # GATHER
gather_prepopulate = "rocky-packages.json" gather_prepopulate = "prepopulate.json"
gather_method = { gather_method = {
"^(?!(AppStream|PowerTools)).*$":{ "^(?!(AppStream|PowerTools)).*$":{
@ -82,7 +82,7 @@ createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 8 createrepo_num_workers = 8
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
# CHECKSUMS # CHECKSUMS
media_checksums = ['sha256'] media_checksums = ['sha256']
@ -110,12 +110,12 @@ buildinstall_skip = [
] ]
image_name_format = { image_name_format = {
"^BaseOS$": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", "^BaseOS$": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
"^Minimal$": "{release_short}-8.7-{arch}-minimal{suffix}", "^Minimal$": "{release_short}-8.8-{arch}-minimal{suffix}",
".*": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", ".*": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
} }
image_volid_formats = [ '{release_short}-8.7-{arch}-{disc_type}', ] image_volid_formats = [ '{release_short}-8.8-{arch}-{disc_type}', ]
# CREATEISO # CREATEISO
create_optional_isos = False create_optional_isos = False
@ -130,12 +130,12 @@ createiso_skip = [
extra_isos = { extra_isos = {
"BaseOS": [{ "BaseOS": [{
"include_variants": ["AppStream"], "include_variants": ["AppStream"],
"filename": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", "filename": "{release_short}-8.8-{arch}-{disc_type}{disc_num}{suffix}",
"skip_src": True, "skip_src": True,
}], }],
"Minimal": [{ "Minimal": [{
"include_variants": ["BaseOS"], "include_variants": ["BaseOS"],
"filename": "{release_short}-8.7-{arch}-minimal{suffix}", "filename": "{release_short}-8.8-{arch}-minimal{suffix}",
"skip_src": True, "skip_src": True,
}] }]
} }

2
rockyrpi.conf
View File

@ -30,7 +30,7 @@ createrepo_checksum = "sha256"
createrepo_use_xz = True createrepo_use_xz = True
createrepo_num_threads = 8 createrepo_num_threads = 8
createrepo_num_workers = 8 createrepo_num_workers = 8
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.8']
hashed_directories = True hashed_directories = True
filter_packages = [ filter_packages = [

2
scripts/common-8
View File

@ -1 +1 @@
REVISION="8.7" REVISION="8.8"

2
scripts/updates-8-extras.sh
View File

@ -7,7 +7,7 @@ CONFIG=/etc/pungi-prod/extras.conf
# Unused for now # Unused for now
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID) OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg" SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
LABEL="--production --label RC-8.7" LABEL="--production --label RC-8.8"
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $SKIP $LABEL" CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $SKIP $LABEL"
if [ -z "$COMPOSE_ID" ]; then if [ -z "$COMPOSE_ID" ]; then

2
scripts/updates-8-i686.sh
View File

@ -8,7 +8,7 @@ CONFIG=/etc/pungi-prod/r8-i686-updates.conf
# Unused for now # Unused for now
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID) OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg" SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
LABEL="--production --label RC-8.7" LABEL="--production --label RC-8.8"
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL" CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL"
#COMPOSE_ID="Rocky-8-20210625.n.0" #COMPOSE_ID="Rocky-8-20210625.n.0"

2
scripts/updates-8-plus.sh
View File

@ -7,7 +7,7 @@ CONFIG=/etc/pungi-prod/plus.conf
# Unused for now # Unused for now
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID) OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg" SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
LABEL="--production --label RC-8.7" LABEL="--production --label RC-8.8"
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $SKIP $LABEL" CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $SKIP $LABEL"

2
scripts/updates-8.sh
View File

@ -8,7 +8,7 @@ CONFIG=/etc/pungi-prod/r8-updates.conf
# Unused for now # Unused for now
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID) OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-8/COMPOSE_ID)
SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg" SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
LABEL="--production --label RC-8.7" LABEL="--production --label RC-8.8"
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL" CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL"
#COMPOSE_ID="Rocky-8-20210625.n.0" #COMPOSE_ID="Rocky-8-20210625.n.0"

4
upcoming/README.md
View File

@ -1,4 +0,0 @@
upcoming
========
Only for upcoming releases. Configurations will be moved to the root when ready.

185
upcoming/include-excludes.conf
View File

@ -1,185 +0,0 @@
filter_packages = [
("^(BaseOS|AppStream|HighAvailability|ResilientStorage)$", {
"*": [
"python36",
"gcc-toolset-9-*-testsuite",
"gcc-toolset-9-gcc-plugin-devel",
"tuned-profiles-sap", # RCM-53604 - This should be only in SAP
"tuned-profiles-sap-hana", # RCM-53604 - This should be only in SAPHANA
"java-*slowdebug*",
"java-*fastdebug*",
"insights-client",
]
}),
("^BaseOS$", {
"*": [
"compat-openssl10-devel",
"compat-openssl10-pkcs11-helper",
"openldap-servers-debuginfo",
"ongres-scram",
]
}),
("^.*$", {
"*": [
"java-11-openjdk-*slowdebug*",
]
}),
]
#filter_modules = [
# ("^AppStream$", {
# "aarch64":
# [
# "eclipse:rhel8",
# ],
# "ppc64le":
# [
# "eclipse:rhel8",
# ],
# "s390x": [
# "eclipse:rhel8",
# ]
# }),
#]
additional_packages = [
("^AppStream$", {
"*": [
"libasan5",
"libubsan1",
"dotnet5.0",
"gcc-toolset-10-dyninst-devel",
"gnome-software-editor",
"pipewire-docs",
"rt-tests",
"micropipenv",
"nispor",
"nispor-devel",
"osbuild-composer-core",
"python3-nispor",
"libnumbertext",
"dotnet-sdk-3.0",
"perl-IO-String",
"stalld",
"dejavu-lgc-sans-fonts",
"xorg-x11-drivers",
"fstrm",
"fstrm-devel",
"ucx-cma",
"ucx-ib",
"ucx-rdmacm"
"ucx-devel",
"qatengine",
"mpich-doc",
"mvapich2-devel",
"mvapich2-psm2-devel",
"mvapich2-doc",
"libecpg",
"rsyslog-udpspoof",
"mysql-selinux",
"rshim",
"qatlib",
"tracer",
"flatpak-xdg-utils",
"modulemd-tools",
"emoji-picker",
"rhc-worker-playbook",
]
}),
# ("^Devel$", {
# "*": [
# "*",
# ]
# }),
("^BaseOS$", {
"*": [
"python3-debuginfo",
"python3-pyverbs",
"syslinux-tftpboot",
"samba-winexe",
"accel-config",
"ima-evm-utils0",
]
}),
("^BaseOS$", {
"x86_64": [
"alsa-sof-firmware-debug",
],
}),
("^Devel$", {
"*": [
"argparse-manpage",
"autogen-libopts-devel",
"gfbgraph-devel",
"jbig2dec-devel",
"liba52-devel",
"libavc1394-devel",
"libdvdnav-devel",
"libnml-devel",
"libss-devel",
"libssh2-devel",
"libuv-devel",
"mobile-broadband-provider-info-devel",
"openslp-devel",
"protobuf-lite-devel",
"quota-devel",
"rest-devel",
"tracker-devel",
]
}),
("^PowerTools$", {
"*": [
"libdnf-devel",
"librepo-devel",
"librhsm-devel",
"libsolv-devel",
"libsolv-tools",
"ibus-typing-booster-tests",
]
}),
("PowerTools", {
"aarch64": [
"java-1.8.0-openjdk-*slowdebug*",
"java-11-openjdk-*slowdebug*",
],
"ppc64le": [
"java-1.8.0-openjdk-*slowdebug*",
"java-11-openjdk-*slowdebug*",
],
"x86_64": [
"java-1.8.0-openjdk-*slowdebug*",
"java-11-openjdk-*slowdebug*",
],
}),
("PowerTools", {
"x86_64": [
"java-1.8.0-openjdk-*fastdebug*",
"java-11-openjdk-*fastdebug*",
]
}),
("^BaseOS$", {
"*": [
"rocky-obsolete-packages",
],
"armhfp": [
"kernel-lpae*",
"uboot-tools",
"uboot-images*",
"grub2*",
"grubby-deprecated",
"efibootmgr",
"cloud-utils-growpart",
"bcm283x-firmware",
"efivar*",
]
}),
]

17
upcoming/multilib.conf
View File

@ -1,17 +0,0 @@
# format: {arch|*: [packages]}
multilib_blacklist = {
"*": [
"libvirt*",
"java-*",
"totem",
],
}
# format: {arch|*: [packages]}
multilib_whitelist = {
"*": [
"valgrind",
"papi",
"gcc-toolset-9-valgrind",
],
}

185
upcoming/r8.conf
View File

@ -1,185 +0,0 @@
from multilib import *
from include-excludes import *
#from images import *
# PRODUCT INFO
release_name = "Rocky Linux"
release_short = "Rocky"
release_version = "8"
version = "8.4"
# GENERAL SETTINGS
comps_file = {
'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/comps.git',
'branch': 'main',
'file': 'comps-rocky-8.4.xml',
}
#link_type = 'hardlink-or-copy'
link_type = 'copy'
module_defaults_dir = {
'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git',
'branch': 'r8.4',
'dir': '.',
}
multilib = [
('^.*$', {
'x86_64': ['devel', 'runtime']
}),
]
variants_file = 'variants.xml'
sigkeys = ['6D745A60']
hashed_directories = False
tree_arches = ['aarch64', 'i386', 'x86_64']
# RUNROOT SETTINGS
runroot_channel = 'image'
runroot_tag = 'dist-rocky8-build'
runroot_method = 'koji'
# PKGSET
pkgset_source = "koji"
koji_profile = "koji"
# PKGSET - KOJI
pkgset_koji_tag = "dist-rocky8-compose"
pkgset_koji_inherit = False
pkgset_koji_module_tag = "dist-rocky8-module-compose"
#pkgset_allow_reuse = False
pkgset_allow_reuse = True
filter_system_release_packages = False
createiso_break_hardlinks = True
# GATHER
gather_prepopulate = "rocky-packages.json"
gather_method = {
"^(?!(AppStream|PowerTools)).*$":{
"comps": "deps"
},
"^(AppStream|PowerTools)$": "hybrid",
}
gather_backend = "dnf"
check_deps = False
greedy_method = "none"
repoclosure_backend = "dnf"
# CREATEREPO
createrepo_deltas = False
createrepo_database = True
createrepo_c = True
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.4']
# CHECKSUMS
media_checksums = ['sha256']
media_checksum_one_file = True
create_jigdo = False
# BUILDINSTALL
bootable = True
buildinstall_method = "lorax"
lorax_options = [
("^.*$", {
"*": {
"noupgrade": False,
"rootfs_size": 3,
"version": "8"
}
})
]
buildinstall_skip = [
("^(AppStream|PowerTools|HighAvailability|ResilientStorage)$", {
"*": True
}),
]
image_name_format = {
"^BaseOS$": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
"^Minimal$": "{release_short}-8.4-{arch}-minimal{suffix}",
".*": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
}
image_volid_formats = [ '{release_short}-8.4-{arch}-{disc_type}', ]
# CREATEISO
create_optional_isos = False
createiso_skip = [
('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage)$', {
'*': True,
'src':True
}),
]
extra_isos = {
"BaseOS": [{
"include_variants": ["AppStream"],
"filename": "{release_short}-8.4-{arch}-{disc_type}{disc_num}{suffix}",
"skip_src": True,
}],
"Minimal": [{
"include_variants": ["BaseOS"],
"filename": "{release_short}-8.4-{arch}-minimal{suffix}",
"skip_src": True,
}]
}
restricted_volid = True
# LOOKASIDE
variant_as_lookaside = [
('AppStream', 'BaseOS'),
('PowerTools', 'BaseOS'),
('PowerTools', 'AppStream'),
('HighAvailability', 'BaseOS'),
('HighAvailability', 'AppStream'),
("ResilientStorage", "BaseOS"),
("ResilientStorage", "AppStream"),
# ("RT", "BaseOS"),
# ("RT", "AppStream"),
# ("NFV", "BaseOS"),
# ("NFV", "AppStream"),
]
extra_files = [
("^.*$", {
"*": [
{
"scm": "git",
"repo": "https://git.rockylinux.org/original/rpms/rocky-release.git",
"branch": "r8",
"file": [
'SOURCES/LICENSE',
'SOURCES/EULA',
'SOURCES/COMMUNITY-CHARTER',
'SOURCES/RPM-GPG-KEY-rockyofficial',
],
"target": "",
},
]
}),
]
productimg = False
translate_paths = [
("/mnt/koji", "https://koji.rockylinux.org/kojifiles")
#("/compose", "http://172.22.0.123/compose"),
]

26740
upcoming/rocky-packages.json
View File

File diff suppressed because it is too large Load Diff

294
upcoming/variants.xml
View File

@ -1,294 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
<variants>
<variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
<!-- List of architectures for BaseOS compose variant -->
<arches>
<arch>aarch64</arch>
<arch>x86_64</arch>
<arch>ppc64le</arch>
</arches>
<!-- List of comps groups that should be part of BaseOS compose variant -->
<groups>
<!-- Essential groups for Anaconda installation -->
<group default="true">guest-agents</group>
<group default="true">standard</group>
<group default="true">base</group>
<group default="true">core</group>
<!-- Other groups -->
<group default="true">binary-intentionally-in-rhel-8</group>
<group default="true">additional-devel</group>
<group default="false">anaconda-tools</group>
<group default="false">conflicts-baseos</group>
<group default="true">development</group>
<group default="true">server-product</group>
<group default="true">dial-up</group>
<group default="true">networkmanager-submodules</group>
<group default="true">file-server</group>
<group default="true">fonts</group>
<group default="true">gnome-desktop</group>
<group default="true">graphical-admin-tools</group>
<group default="true">hardware-monitoring</group>
<group default="true">hardware-support</group>
<group default="true">infiniband</group>
<group default="true">headless-management</group>
<group default="true">large-systems</group>
<group default="true">legacy-unix</group>
<group default="true">mail-server</group>
<group default="true">mainframe-access</group>
<group default="true">multimedia</group>
<group default="true">dns-server</group>
<group default="true">smart-card</group>
<group default="true">smb-server</group>
<group default="true">network-tools</group>
<group default="true">network-file-system-client</group>
<group default="true">network-server</group>
<group default="true">performance</group>
<group default="true">platform-devel</group>
<group default="true">python-web</group>
<group default="true">remote-system-management</group>
<group default="true">scientific</group>
<group default="true">security-tools</group>
<group default="true">system-tools</group>
<group default="true">workstation-product</group>
</groups>
<!-- List of environments from comps that should be part of BaseOS compose variant -->
<environments>
<environment display_order="3">minimal-environment</environment>
<environment display_order="99">custom-environment</environment>
<environment display_order="2">server-product-environment</environment>
</environments>
</variant>
<variant id="AppStream" name="AppStream" type="variant">
<!-- List of architectures for AppStream compose variant -->
<arches>
<arch>aarch64</arch>
<arch>ppc64le</arch>
<arch>x86_64</arch>
</arches>
<!-- List of comps groups that should be part of AppStream compose variant -->
<groups>
<group default="true">nonmodular-appstream</group>
<group default="true">standard</group>
<group default="false">anaconda-tools</group>
<group default="true">base</group>
<group default="false">conflicts-appstream</group>
<group default="true">core</group>
<group default="true">additional-devel</group>
<group default="true">base-x</group>
<group default="true">debugging</group>
<group default="true">development</group>
<group default="true">dotnet-core</group>
<group default="true">file-server</group>
<group default="true">ftp-server</group>
<group default="true">gnome-apps</group>
<group default="true">gnome-desktop</group>
<group default="true">guest-desktop-agents</group>
<group default="true">graphical-admin-tools</group>
<group default="true">graphics</group>
<group default="true">infiniband</group>
<group default="true">workstation-product</group>
<group default="true">multimedia</group>
<group default="true">mail-server</group>
<group default="true">mainframe-access</group>
<group default="true">network-server</group>
<group default="true">network-tools</group>
<group default="true">container-management</group>
<group default="true">smb-server</group>
<group default="true">dial-up</group>
<group default="true">fonts</group>
<group default="true">input-methods</group>
<group default="true">multimedia</group>
<group default="true">networkmanager-submodules</group>
<group default="true">network-file-system-client</group>
<group default="true">print-client</group>
<group default="true">desktop-debugging</group>
<group default="true">internet-browser</group>
<group default="true">gnome-desktop</group>
<group default="true">guest-agents</group>
<group default="true">guest-desktop-agents</group>
<group default="true">headless-management</group>
<group default="true">java-platform</group>
<group default="true">gnome-apps</group>
<group default="true">internet-applications</group>
<group default="true">office-suite</group>
<group default="true">performance</group>
<group default="true">platform-devel</group>
<group default="true">platform-kvm</group>
<group default="true">platform-microsoft</group>
<group default="true">platform-vmware</group>
<group default="true">scientific</group>
<group default="true">ostree-support</group>
<group default="true">security-tools</group>
<group default="true">smart-card</group>
<group default="true">system-tools</group>
<group default="true">texlive</group>
<group default="true">legacy-x</group>
<group default="true">backup-client</group>
<group default="true">remote-desktop-clients</group>
<group default="true">remote-system-management</group>
<group default="true">rpm-development-tools</group>
<group default="true">virtualization-client</group>
<group default="true">virtualization-hypervisor</group>
<group default="true">virtualization-platform</group>
<group default="true">virtualization-tools</group>
<group default="true">web-server</group>
</groups>
<!-- List of environments from comps that should be part of BaseOS compose variant -->
<environments>
<environment display_order="3">minimal-environment</environment>
<environment display_order="99">virtualization-host-environment</environment>
<environment display_order="99">custom-environment</environment>
<environment display_order="2">server-product-environment</environment>
<environment display_order="1">graphical-server-environment</environment>
<environment display_order="4">workstation-product-environment</environment>
</environments>
<!-- List of modules that should be part of AppStream compose variant -->
<modules>
<module>389-ds:1.4</module>
<module>ant:1.10</module>
<module>perl-App-cpanminus:1.7044</module>
<module>perl-DBD-MySQL:4.046</module>
<module>perl-DBD-Pg:3.7</module>
<module>perl-DBD-SQLite:1.58</module>
<module>perl-DBI:1.641</module>
<module>perl-IO-Socket-SSL:2.066</module>
<module>perl-libwww-perl:6.34</module>
<module>container-tools:1.0</module>
<module>container-tools:2.0</module>
<module>container-tools:3.0</module>
<module>container-tools:rhel8</module>
<module>freeradius:3.0</module>
<module>gimp:2.8</module>
<module>go-toolset:rhel8</module>
<module>httpd:2.4</module>
<module>idm:DL1</module>
<module>idm:client</module>
<module>inkscape:0.92.3</module>
<module>javapackages-runtime:201801</module>
<module>jmc:rhel8</module>
<module>libselinux-python:2.8</module>
<module>llvm-toolset:rhel8</module>
<module>mailman:2.1</module>
<module>mariadb:10.3</module>
<module>mariadb:10.5</module>
<module>maven:3.5</module>
<module>maven:3.6</module>
<module>mercurial:4.8</module>
<module>mod_auth_openidc:2.3</module>
<module>mysql:8.0</module>
<module>nginx:1.14</module>
<module>nginx:1.16</module>
<module>nginx:1.18</module>
<module>nodejs:10</module>
<module>nodejs:12</module>
<module>nodejs:14</module>
<module>parfait:0.5</module>
<module>perl:5.24</module>
<module>perl:5.26</module>
<module>perl:5.30</module>
<module>perl-FCGI:0.78</module>
<module>php:7.2</module>
<module>php:7.3</module>
<module>php:7.4</module>
<module>pki-core:10.6</module>
<module>pki-deps:10.6</module>
<module>pmdk:1-fileformat-v6</module>
<module>postgresql:10</module>
<module>postgresql:9.6</module>
<module>postgresql:12</module>
<module>postgresql:13</module>
<module>python27:2.7</module>
<module>python36:3.6</module>
<module>python38:3.8</module>
<module>python39:3.9</module>
<module>redis:5</module>
<module>redis:6</module>
<module>rhn-tools:1.0</module>
<module>ruby:2.5</module>
<module>ruby:2.6</module>
<module>ruby:2.7</module>
<module>rust-toolset:rhel8</module>
<module>satellite-5-client:1.0</module>
<module>scala:2.10</module>
<module>squid:4</module>
<module>subversion:1.10</module>
<module>subversion:1.14</module>
<module>swig:3.0</module>
<module>swig:4.0</module>
<module>varnish:6</module>
<module>virt:rhel</module>
<module>perl-YAML:1.24</module>
</modules>
</variant>
<variant id="Minimal" name="Minimal" type="variant">
<arches>
<arch>aarch64</arch>
<arch>x86_64</arch>
<arch>ppc64le</arch>
</arches>
<groups>
<group default="true">core</group>
</groups>
<environments>
<environment display_order="3">minimal-environment</environment>
</environments>
</variant>
<variant id="PowerTools" name="PowerTools" type="variant">
<!-- List of architectures for Powertools compose variant -->
<arches>
<arch>aarch64</arch>
<arch>ppc64le</arch>
<arch>x86_64</arch>
</arches>
<groups>
<group default="true">rocky-powertools</group>
</groups>
<modules>
<module>javapackages-tools:201801</module>
<module>mariadb-devel:10.3</module>
<module>virt-devel:rhel</module>
<module>python38-devel:3.8</module>
<module>python39-devel:3.9</module>
</modules>
</variant>
<!-- ADDONS (Defined as variants in RHEL-8) -->
<variant id="ResilientStorage" name="Resilient Storage" type="variant">
<arches>
<arch>x86_64</arch>
<arch>ppc64le</arch>
<arch>aarch64</arch>
</arches>
<groups>
<group default="true">ha</group>
<group default="true">ha-devel</group>
<group default="true">resilient-storage</group>
</groups>
</variant>
<variant id="HighAvailability" name="High Availability" type="variant">
<arches>
<arch>aarch64</arch>
<arch>x86_64</arch>
<arch>ppc64le</arch>
</arches>
<groups>
<group default="true">ha</group>
<group default="true">ha-devel</group>
</groups>
</variant>
<variant id="Cloud" name="Cloud" type="variant" is_empty="true">
<arches>
<arch>aarch64</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
<arch>x86_64</arch>
</arches>
</variant>
</variants>