From 07f7398613670abad024e21437a912f6e0b0ac76 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Mon, 20 Mar 2023 11:05:01 -0700 Subject: [PATCH] prepare for 8.9 --- container.conf | 8 ++++---- extras.conf | 2 +- legacy/advanced-virt.conf | 2 +- legacy/gluster9.conf | 2 +- legacy/kernel.conf | 2 +- legacy/kmod.conf | 2 +- legacy/nfv.conf | 2 +- legacy/r8-beta.conf | 24 ++++++++++++------------ legacy/r8-i686-devel.conf | 4 ++-- legacy/r8-i686.conf | 22 +++++++++++----------- legacy/r8.conf | 24 ++++++++++++------------ legacy/r8lh.conf | 14 +++++++------- legacy/rockyrpi.conf | 2 +- plus.conf | 2 +- rocky-beta.conf | 2 +- rocky/images.conf | 6 +++--- rocky/variables.conf | 6 +++--- rockylh.conf | 2 +- scripts/common-8 | 2 +- scripts/updates-8-extras.sh | 2 +- scripts/updates-8-i686.sh | 2 +- scripts/updates-8-plus.sh | 2 +- scripts/updates-8.sh | 2 +- shared/buildinstall.conf | 8 ++++---- shared/createrepo.conf | 2 +- shared/extra_isos.conf | 4 ++-- 26 files changed, 76 insertions(+), 76 deletions(-) diff --git a/container.conf b/container.conf index ada4876..44f260e 100644 --- a/container.conf +++ b/container.conf @@ -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": { diff --git a/extras.conf b/extras.conf index 68f6ce1..0ab1248 100644 --- a/extras.conf +++ b/extras.conf @@ -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 diff --git a/legacy/advanced-virt.conf b/legacy/advanced-virt.conf index 512993c..f087c68 100644 --- a/legacy/advanced-virt.conf +++ b/legacy/advanced-virt.conf @@ -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 = [ diff --git a/legacy/gluster9.conf b/legacy/gluster9.conf index a87276f..4475b49 100644 --- a/legacy/gluster9.conf +++ b/legacy/gluster9.conf @@ -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 = [ diff --git a/legacy/kernel.conf b/legacy/kernel.conf index 2105452..f957635 100644 --- a/legacy/kernel.conf +++ b/legacy/kernel.conf @@ -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 = [ diff --git a/legacy/kmod.conf b/legacy/kmod.conf index 8918437..d837fd2 100644 --- a/legacy/kmod.conf +++ b/legacy/kmod.conf @@ -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 = [ diff --git a/legacy/nfv.conf b/legacy/nfv.conf index ddd7225..07b2e72 100644 --- a/legacy/nfv.conf +++ b/legacy/nfv.conf @@ -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 = [ diff --git a/legacy/r8-beta.conf b/legacy/r8-beta.conf index 4120d9f..d6419b6 100644 --- a/legacy/r8-beta.conf +++ b/legacy/r8-beta.conf @@ -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, }] } diff --git a/legacy/r8-i686-devel.conf b/legacy/r8-i686-devel.conf index 2d985f1..013b284 100644 --- a/legacy/r8-i686-devel.conf +++ b/legacy/r8-i686-devel.conf @@ -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': '.', } diff --git a/legacy/r8-i686.conf b/legacy/r8-i686.conf index 7f524c4..758a42e 100644 --- a/legacy/r8-i686.conf +++ b/legacy/r8-i686.conf @@ -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, }] } diff --git a/legacy/r8.conf b/legacy/r8.conf index f90032c..ce6e9db 100644 --- a/legacy/r8.conf +++ b/legacy/r8.conf @@ -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, }] } diff --git a/legacy/r8lh.conf b/legacy/r8lh.conf index 9838068..beb1387 100644 --- a/legacy/r8lh.conf +++ b/legacy/r8lh.conf @@ -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 diff --git a/legacy/rockyrpi.conf b/legacy/rockyrpi.conf index 75df052..339bd7f 100644 --- a/legacy/rockyrpi.conf +++ b/legacy/rockyrpi.conf @@ -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 = [ diff --git a/plus.conf b/plus.conf index d29a42c..c9eb1b6 100644 --- a/plus.conf +++ b/plus.conf @@ -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' diff --git a/rocky-beta.conf b/rocky-beta.conf index 43caebb..8cb70f4 100644 --- a/rocky-beta.conf +++ b/rocky-beta.conf @@ -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}', ] diff --git a/rocky/images.conf b/rocky/images.conf index 04e531e..ee6e290 100644 --- a/rocky/images.conf +++ b/rocky/images.conf @@ -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", diff --git a/rocky/variables.conf b/rocky/variables.conf index bd4ac0a..b034873 100644 --- a/rocky/variables.conf +++ b/rocky/variables.conf @@ -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' diff --git a/rockylh.conf b/rockylh.conf index e2560cd..fde0ff2 100644 --- a/rockylh.conf +++ b/rockylh.conf @@ -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}', ] diff --git a/scripts/common-8 b/scripts/common-8 index 1d88daa..d1c3a4d 100644 --- a/scripts/common-8 +++ b/scripts/common-8 @@ -1,5 +1,5 @@ MAJOR="8" -REVISION="8.8" +REVISION="8.9" FROMMAIL="Compose Tracker " TOMAIL="releng@rockylinux.org" diff --git a/scripts/updates-8-extras.sh b/scripts/updates-8-extras.sh index 615e2c3..82e682f 100755 --- a/scripts/updates-8-extras.sh +++ b/scripts/updates-8-extras.sh @@ -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 diff --git a/scripts/updates-8-i686.sh b/scripts/updates-8-i686.sh index fb8314b..7890e15 100755 --- a/scripts/updates-8-i686.sh +++ b/scripts/updates-8-i686.sh @@ -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" diff --git a/scripts/updates-8-plus.sh b/scripts/updates-8-plus.sh index 45f3d42..359c8fb 100755 --- a/scripts/updates-8-plus.sh +++ b/scripts/updates-8-plus.sh @@ -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" diff --git a/scripts/updates-8.sh b/scripts/updates-8.sh index 7b646ab..464c7d6 100755 --- a/scripts/updates-8.sh +++ b/scripts/updates-8.sh @@ -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" diff --git a/shared/buildinstall.conf b/shared/buildinstall.conf index 10e6481..8655fe7 100644 --- a/shared/buildinstall.conf +++ b/shared/buildinstall.conf @@ -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)$", { diff --git a/shared/createrepo.conf b/shared/createrepo.conf index 1314813..a19c27a 100644 --- a/shared/createrepo.conf +++ b/shared/createrepo.conf @@ -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'] diff --git a/shared/extra_isos.conf b/shared/extra_isos.conf index 18f4f34..2b59c52 100644 --- a/shared/extra_isos.conf +++ b/shared/extra_isos.conf @@ -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, }] }