sig_core/pungi-rocky
7
0
Fork 0
mirror of https://git.rockylinux.org/rocky/pungi-rocky.git synced 2024-11-21 20:31:30 +00:00
Code Issues Projects Releases Wiki Activity

bump to 8.10

Browse Source
This commit is contained in:
Louis Abel 2023-09-07 12:25:00 -07:00
parent 6c78a2f3cf
commit ed60a997d9
Signed by: label
GPG Key ID: B37E62D143879B36
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
container.conf
View File

@ -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.9'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.10']
# 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.9", "version": "8.10",
"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.9/BaseOS/$arch/os', 'http://dl.rockylinux.org/pub/rocky/8.10/BaseOS/$arch/os',
], ],
"install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.9/BaseOS/$arch/os', "install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.10/BaseOS/$arch/os',
"failable": ["ppc64le","aarch64"], "failable": ["ppc64le","aarch64"],
}, },
"factory-parameters": { "factory-parameters": {

2
extras-lh.conf
View File

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

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

2
rocky-beta.conf
View File

@ -27,6 +27,6 @@ image_name_format = {
".*": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}", ".*": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
} }
image_volid_formats = [ '{release_short}-8.9-BETA-{arch}-{disc_type}', ] image_volid_formats = [ '{release_short}-8.10-BETA-{arch}-{disc_type}', ]

2
rocky-lh.conf
View File

@ -27,6 +27,6 @@ image_name_format = {
".*": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}", ".*": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
} }
image_volid_formats = [ '{release_short}-8.9-LH-{arch}-{disc_type}', ] image_volid_formats = [ '{release_short}-8.10-LH-{arch}-{disc_type}', ]

6
rocky/images.conf
View File

@ -3,7 +3,7 @@
# '^Workstation$': [ # '^Workstation$': [
# { # {
# 'name': 'Rocky-Workstation-8', # 'name': 'Rocky-Workstation-8',
# 'version': '8.9', # 'version': '8.10',
# 'arches': ['x86_64'], # 'arches': ['x86_64'],
# 'kickstart': 'Rocky-8-Workstation.ks', # 'kickstart': 'Rocky-8-Workstation.ks',
# 'repo': ['BaseOS', 'AppStream', 'PowerTools', 'extras'], # 'repo': ['BaseOS', 'AppStream', 'PowerTools', 'extras'],
@ -18,7 +18,7 @@ image_build = {
"format": [("qcow2", "qcow2")], "format": [("qcow2", "qcow2")],
"name": "Rocky-8-GenericCloud", "name": "Rocky-8-GenericCloud",
"subvariant": "generic", "subvariant": "generic",
"version": "8.9", "version": "8.10",
"release": "!RELEASE_FROM_DATE_RESPIN" "release": "!RELEASE_FROM_DATE_RESPIN"
"target": "image-rocky-8", "target": "image-rocky-8",
"ksurl": "git+https://git.resf.org/sig_core/kickstarts.git?#origin/r8", "ksurl": "git+https://git.resf.org/sig_core/kickstarts.git?#origin/r8",
@ -40,7 +40,7 @@ image_build = {
"format": [("raw-xz", "raw.xz")], "format": [("raw-xz", "raw.xz")],
"name": "Rocky-8-EC2", "name": "Rocky-8-EC2",
"subvariant": "ec2", "subvariant": "ec2",
"version": "8.9", "version": "8.10",
"release": "!RELEASE_FROM_DATE_RESPIN" "release": "!RELEASE_FROM_DATE_RESPIN"
"target": "image-rocky-8", "target": "image-rocky-8",
"ksurl": "git+https://git.resf.org/sig_core/kickstarts.git?#origin/r8", "ksurl": "git+https://git.resf.org/sig_core/kickstarts.git?#origin/r8",

6
rocky/variables.conf
View File

@ -2,8 +2,8 @@
RELEASE_NAME = 'Rocky Linux' RELEASE_NAME = 'Rocky Linux'
RELEASE_SHORT = 'Rocky' RELEASE_SHORT = 'Rocky'
RELEASE_VERSION = '8.9' RELEASE_VERSION = '8.10'
VERSION = '8.9' VERSION = '8.10'
PKGSET_KOJI_TAG = 'dist-rocky8-compose' PKGSET_KOJI_TAG = 'dist-rocky8-compose'
PKGSET_KOJI_MODULE_TAG = 'dist-rocky8-module-compose' PKGSET_KOJI_MODULE_TAG = 'dist-rocky8-module-compose'
@ -17,7 +17,7 @@ COMPS_FILE = 'comps-rocky-%s.xml' % RELEASE_VERSION
COMPS_COMMAND = '' COMPS_COMMAND = ''
MODULE_DEFAULTS_REPO = 'https://git.rockylinux.org/rocky/rocky-module-defaults.git' MODULE_DEFAULTS_REPO = 'https://git.rockylinux.org/rocky/rocky-module-defaults.git'
MODULE_DEFAULTS_BRANCH = 'r8.9' MODULE_DEFAULTS_BRANCH = 'r8.10'
VARIANTS_SCM = 'git' VARIANTS_SCM = 'git'
VARIANTS_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git' VARIANTS_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git'

2
scripts/common-8
View File

@ -1,5 +1,5 @@
MAJOR="8" MAJOR="8"
REVISION="8.9" REVISION="8.10"
FROMMAIL="Compose Tracker <releng@rockylinux.org>" FROMMAIL="Compose Tracker <releng@rockylinux.org>"
TOMAIL="releng@rockylinux.org" TOMAIL="releng@rockylinux.org"

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.9" LABEL="--production --label RC-8.10"
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.9" LABEL="--production --label RC-8.10"
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.sh
View File

@ -8,7 +8,7 @@ CONFIG=/etc/pungi-prod/rocky-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.9" LABEL="--production --label RC-8.10"
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"

8
shared/buildinstall.conf
View File

@ -10,12 +10,12 @@ lorax_options = [
] ]
image_name_format = { image_name_format = {
"^BaseOS$": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}", "^BaseOS$": "{release_short}-8.10-{arch}-{disc_type}{disc_num}{suffix}",
"^Minimal$": "{release_short}-8.9-{arch}-minimal{suffix}", "^Minimal$": "{release_short}-8.10-{arch}-minimal{suffix}",
".*": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}", ".*": "{release_short}-8.10-{arch}-{disc_type}{disc_num}{suffix}",
} }
image_volid_formats = [ '{release_short}-8.9-{arch}-{disc_type}', ] image_volid_formats = [ '{release_short}-8.10-{arch}-{disc_type}', ]
buildinstall_skip = [ buildinstall_skip = [
("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$", { ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$", {

2
shared/createrepo.conf
View File

@ -5,4 +5,4 @@ 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.9'] createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.10']

4
shared/extra_isos.conf
View File

@ -1,13 +1,13 @@
extra_isos = { extra_isos = {
"BaseOS": [{ "BaseOS": [{
"include_variants": ["AppStream"], "include_variants": ["AppStream"],
"filename": "{release_short}-8.9-{arch}-{disc_type}{disc_num}{suffix}", "filename": "{release_short}-8.10-{arch}-{disc_type}{disc_num}{suffix}",
"skip_src": True, "skip_src": True,
"failable_arches": ['i386', 'i686'] "failable_arches": ['i386', 'i686']
}], }],
"Minimal": [{ "Minimal": [{
"include_variants": ["BaseOS"], "include_variants": ["BaseOS"],
"filename": "{release_short}-8.9-{arch}-minimal{suffix}", "filename": "{release_short}-8.10-{arch}-minimal{suffix}",
"skip_src": True, "skip_src": True,
"failable_arches": ['i386', 'i686'] "failable_arches": ['i386', 'i686']
}] }]