sig_core
/
pungi-rocky
mirror of https://git.rockylinux.org/rocky/pungi-rocky.git
7
0
Fork 0
Code Issues Projects Releases Wiki Activity

prepping for 8.6

This commit is contained in:
nazunalika 2022-04-15 14:33:51 -07:00
parent 5af10c0a57
commit 06fc25b861
Signed by: label
GPG Key ID: 6735C0E1BD65D048
19 changed files with 51 additions and 51 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_num_threads = 8
createrepo_num_workers = 8
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.5']
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.6']
hashed_directories = True
filter_packages = [

8
container.conf
View File

@ -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.5']
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.6']
# CHECKSUMS
media_checksums = ['sha256']
@ -72,7 +72,7 @@ image_build = {
"format": [("docker", "tar.gz")],
"name": "Rocky-8-Container",
"target": "image-rocky-8",
"version": "8.5",
"version": "8.6",
"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.5/BaseOS/$arch/os',
'http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$arch/os',
],
"install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.5/BaseOS/$arch/os',
"install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$arch/os',
"failable": ["ppc64le","aarch64"],
},
"factory-parameters": {

2
extras.conf
View File

@ -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.5']
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.6']
hashed_directories = True
check_deps = False

2
gluster9.conf
View File

@ -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.5']
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.6']
hashed_directories = True
filter_packages = [

16
images-cloud.conf
View File

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

2
kernel.conf
View File

@ -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.5']
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.6']
hashed_directories = True
filter_packages = [

2
kmod.conf
View File

@ -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.5']
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.6']
hashed_directories = True
filter_packages = [

2
nfv.conf
View File

@ -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.5']
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.6']
hashed_directories = True
filter_packages = [

2
plus.conf
View File

@ -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.5']
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.6']
hashed_directories = True
pkgset_koji_tag='dist-rocky8-plus-compose'

4
r8-devel.conf
View File

@ -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.5.xml',
'file': 'comps-rocky-8.6.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.5',
'branch': 'r8.6',
'dir': '.',
}

4
r8-i686-devel.conf
View File

@ -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.5.xml',
'file': 'comps-rocky-8.6.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.5',
'branch': 'r8.6',
'dir': '.',
}

22
r8-i686.conf
View File

@ -6,14 +6,14 @@ from common/include-excludes import *
release_name = "Rocky Linux"
release_short = "Rocky-i686"
release_version = "8"
version = "8.5"
version = "8.6"
# GENERAL SETTINGS
comps_file = {
'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/comps.git',
'branch': 'main',
'file': 'comps-rocky-8.5.xml',
'file': 'comps-rocky-8.6.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.5',
'branch': 'r8.6',
'dir': '.',
}
@ -34,7 +34,7 @@ multilib = [
variants_file = 'variants-i686.xml'
sigkeys = ['6D745A60']
# Change to true for 8.5
# Change to true for 8.6
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.5']
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.6']
# CHECKSUMS
media_checksums = ['sha256']
@ -110,12 +110,12 @@ buildinstall_skip = [
]
image_name_format = {
"^BaseOS$": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
"^Minimal$": "{release_short}-8.5-{arch}-minimal{suffix}",
".*": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
"^BaseOS$": "{release_short}-8.6-{arch}-{disc_type}{disc_num}{suffix}",
"^Minimal$": "{release_short}-8.6-{arch}-minimal{suffix}",
".*": "{release_short}-8.6-{arch}-{disc_type}{disc_num}{suffix}",
}
image_volid_formats = [ '{release_short}-8.5-{arch}-{disc_type}', ]
image_volid_formats = [ '{release_short}-8.6-{arch}-{disc_type}', ]
# CREATEISO
create_optional_isos = False
@ -130,12 +130,12 @@ createiso_skip = [
extra_isos = {
"BaseOS": [{
"include_variants": ["AppStream"],
"filename": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
"filename": "{release_short}-8.6-{arch}-{disc_type}{disc_num}{suffix}",
"skip_src": True,
}],
"Minimal": [{
"include_variants": ["BaseOS"],
"filename": "{release_short}-8.5-{arch}-minimal{suffix}",
"filename": "{release_short}-8.6-{arch}-minimal{suffix}",
"skip_src": True,
}]
}

22
r8.conf
View File

@ -6,14 +6,14 @@ from common/include-excludes import *
release_name = "Rocky Linux"
release_short = "Rocky"
release_version = "8"
version = "8.5"
version = "8.6"
# GENERAL SETTINGS
comps_file = {
'scm': 'git',
'repo': 'https://git.rockylinux.org/rocky/comps.git',
'branch': 'main',
'file': 'comps-rocky-8.5.xml',
'file': 'comps-rocky-8.6.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.5',
'branch': 'r8.6',
'dir': '.',
}
@ -34,7 +34,7 @@ multilib = [
variants_file = 'variants.xml'
sigkeys = ['6D745A60']
# Change to true for 8.5
# Change to true for 8.6
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.5']
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.6']
# CHECKSUMS
media_checksums = ['sha256']
@ -110,12 +110,12 @@ buildinstall_skip = [
]
image_name_format = {
"^BaseOS$": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
"^Minimal$": "{release_short}-8.5-{arch}-minimal{suffix}",
".*": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
"^BaseOS$": "{release_short}-8.6-{arch}-{disc_type}{disc_num}{suffix}",
"^Minimal$": "{release_short}-8.6-{arch}-minimal{suffix}",
".*": "{release_short}-8.6-{arch}-{disc_type}{disc_num}{suffix}",
}
image_volid_formats = [ '{release_short}-8.5-{arch}-{disc_type}', ]
image_volid_formats = [ '{release_short}-8.6-{arch}-{disc_type}', ]
# CREATEISO
create_optional_isos = False
@ -130,12 +130,12 @@ createiso_skip = [
extra_isos = {
"BaseOS": [{
"include_variants": ["AppStream"],
"filename": "{release_short}-8.5-{arch}-{disc_type}{disc_num}{suffix}",
"filename": "{release_short}-8.6-{arch}-{disc_type}{disc_num}{suffix}",
"skip_src": True,
}],
"Minimal": [{
"include_variants": ["BaseOS"],
"filename": "{release_short}-8.5-{arch}-minimal{suffix}",
"filename": "{release_short}-8.6-{arch}-minimal{suffix}",
"skip_src": True,
}]
}

2
rockyrpi.conf
View File

@ -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.5']
createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.6']
hashed_directories = True
filter_packages = [

2
scripts/common-8
View File

@ -1 +1 @@
REVISION="8.5"
REVISION="8.6"

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

@ -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.5"
LABEL="--production --label RC-8.6"
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $SKIP $LABEL"
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
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.5"
LABEL="--production --label RC-8.6"
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL"
#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
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.5"
LABEL="--production --label RC-8.6"
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
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.5"
LABEL="--production --label RC-8.6"
CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL"
#COMPOSE_ID="Rocky-8-20210625.n.0"