From e68e816292fadb0943419159259412bfd820b57f Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Fri, 23 Sep 2022 08:40:02 -0700 Subject: [PATCH] change all refs to 8.7 --- advanced-virt.conf | 2 +- container.conf | 8 ++++---- extras.conf | 2 +- gluster9.conf | 2 +- images-cloud.conf | 16 ++++++++-------- kernel.conf | 2 +- kmod.conf | 2 +- nfv.conf | 2 +- plus.conf | 2 +- r8-devel.conf | 4 ++-- r8-i686-devel.conf | 4 ++-- r8-i686.conf | 22 +++++++++++----------- r8.conf | 22 +++++++++++----------- rockyrpi.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 +- 19 files changed, 51 insertions(+), 51 deletions(-) diff --git a/advanced-virt.conf b/advanced-virt.conf index 72fa508..ce46de8 100644 --- a/advanced-virt.conf +++ b/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.6'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] hashed_directories = True filter_packages = [ diff --git a/container.conf b/container.conf index 3a6504c..5d60816 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.6'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] # CHECKSUMS media_checksums = ['sha256'] @@ -72,7 +72,7 @@ image_build = { "format": [("docker", "tar.gz")], "name": "Rocky-8-Container", "target": "image-rocky-8", - "version": "8.6", + "version": "8.7", "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.6/BaseOS/$arch/os', + 'http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$arch/os', ], - "install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$arch/os', + "install_tree_from": 'http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$arch/os', "failable": ["ppc64le","aarch64"], }, "factory-parameters": { diff --git a/extras.conf b/extras.conf index e38342a..055437c 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.6'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] hashed_directories = True check_deps = False diff --git a/gluster9.conf b/gluster9.conf index 390cd07..4009f10 100644 --- a/gluster9.conf +++ b/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.6'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] hashed_directories = True filter_packages = [ diff --git a/images-cloud.conf b/images-cloud.conf index 0360442..ab8e328 100644 --- a/images-cloud.conf +++ b/images-cloud.conf @@ -5,7 +5,7 @@ image_build = { "format": [("qcow2", "qcow2")], "name": "Rocky-8-GenericCloud", "subvariant": "generic", - "version": "8.6", + "version": "8.7", "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.6/BaseOS/$arch/os/", - "http://dl.rockylinux.org/stg/rocky/8.6/AppStream/$arch/os/", + "http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$arch/os/", + "http://dl.rockylinux.org/stg/rocky/8.7/AppStream/$arch/os/", ], - "install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$arch/os/", + "install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.7/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.6", + "version": "8.7", "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.6/BaseOS/$arch/os/", - "http://dl.rockylinux.org/stg/rocky/8.6/AppStream/$arch/os/", + "http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$arch/os/", + "http://dl.rockylinux.org/stg/rocky/8.7/AppStream/$arch/os/", ], - "install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$arch/os/", + "install_tree_from": "http://dl.rockylinux.org/stg/rocky/8.7/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, diff --git a/kernel.conf b/kernel.conf index 2aab67d..e0f40fd 100644 --- a/kernel.conf +++ b/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.6'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] hashed_directories = True filter_packages = [ diff --git a/kmod.conf b/kmod.conf index 86cce52..5bfb3b3 100644 --- a/kmod.conf +++ b/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.6'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] hashed_directories = True filter_packages = [ diff --git a/nfv.conf b/nfv.conf index 20f4d2b..1ed224f 100644 --- a/nfv.conf +++ b/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.6'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] hashed_directories = True filter_packages = [ diff --git a/plus.conf b/plus.conf index 1e1ae6a..74851a2 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.6'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] hashed_directories = True pkgset_koji_tag='dist-rocky8-plus-compose' diff --git a/r8-devel.conf b/r8-devel.conf index edbb6ec..09da8ac 100644 --- a/r8-devel.conf +++ b/r8-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.6.xml', + 'file': 'comps-rocky-8.7.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.6', + 'branch': 'r8.7', 'dir': '.', } diff --git a/r8-i686-devel.conf b/r8-i686-devel.conf index 6dade49..90f90da 100644 --- a/r8-i686-devel.conf +++ b/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.6.xml', + 'file': 'comps-rocky-8.7.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.6', + 'branch': 'r8.7', 'dir': '.', } diff --git a/r8-i686.conf b/r8-i686.conf index fcc7db6..c45823e 100644 --- a/r8-i686.conf +++ b/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.6" +version = "8.7" # GENERAL SETTINGS comps_file = { 'scm': 'git', 'repo': 'https://git.rockylinux.org/rocky/comps.git', 'branch': 'main', - 'file': 'comps-rocky-8.6.xml', + 'file': 'comps-rocky-8.7.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.6', + 'branch': 'r8.7', 'dir': '.', } @@ -34,7 +34,7 @@ multilib = [ variants_file = 'variants-i686.xml' sigkeys = ['6D745A60'] -# Change to true for 8.6 +# Change to true for 8.7 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.6'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] # CHECKSUMS media_checksums = ['sha256'] @@ -110,12 +110,12 @@ buildinstall_skip = [ ] image_name_format = { - "^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}", + "^BaseOS$": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", + "^Minimal$": "{release_short}-8.7-{arch}-minimal{suffix}", + ".*": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", } -image_volid_formats = [ '{release_short}-8.6-{arch}-{disc_type}', ] +image_volid_formats = [ '{release_short}-8.7-{arch}-{disc_type}', ] # CREATEISO create_optional_isos = False @@ -130,12 +130,12 @@ createiso_skip = [ extra_isos = { "BaseOS": [{ "include_variants": ["AppStream"], - "filename": "{release_short}-8.6-{arch}-{disc_type}{disc_num}{suffix}", + "filename": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", "skip_src": True, }], "Minimal": [{ "include_variants": ["BaseOS"], - "filename": "{release_short}-8.6-{arch}-minimal{suffix}", + "filename": "{release_short}-8.7-{arch}-minimal{suffix}", "skip_src": True, }] } diff --git a/r8.conf b/r8.conf index 6df76b9..ef1b8ab 100644 --- a/r8.conf +++ b/r8.conf @@ -6,14 +6,14 @@ from common/include-excludes import * release_name = "Rocky Linux" release_short = "Rocky" release_version = "8" -version = "8.6" +version = "8.7" # GENERAL SETTINGS comps_file = { 'scm': 'git', 'repo': 'https://git.rockylinux.org/rocky/comps.git', 'branch': 'main', - 'file': 'comps-rocky-8.6.xml', + 'file': 'comps-rocky-8.7.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.6', + 'branch': 'r8.7', 'dir': '.', } @@ -34,7 +34,7 @@ multilib = [ variants_file = 'variants.xml' sigkeys = ['6D745A60'] -# Change to true for 8.6 +# Change to true for 8.7 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.6'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] # CHECKSUMS media_checksums = ['sha256'] @@ -110,12 +110,12 @@ buildinstall_skip = [ ] image_name_format = { - "^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}", + "^BaseOS$": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", + "^Minimal$": "{release_short}-8.7-{arch}-minimal{suffix}", + ".*": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", } -image_volid_formats = [ '{release_short}-8.6-{arch}-{disc_type}', ] +image_volid_formats = [ '{release_short}-8.7-{arch}-{disc_type}', ] # CREATEISO create_optional_isos = False @@ -130,12 +130,12 @@ createiso_skip = [ extra_isos = { "BaseOS": [{ "include_variants": ["AppStream"], - "filename": "{release_short}-8.6-{arch}-{disc_type}{disc_num}{suffix}", + "filename": "{release_short}-8.7-{arch}-{disc_type}{disc_num}{suffix}", "skip_src": True, }], "Minimal": [{ "include_variants": ["BaseOS"], - "filename": "{release_short}-8.6-{arch}-minimal{suffix}", + "filename": "{release_short}-8.7-{arch}-minimal{suffix}", "skip_src": True, }] } diff --git a/rockyrpi.conf b/rockyrpi.conf index 1cb20b5..d99ea2c 100644 --- a/rockyrpi.conf +++ b/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.6'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.7'] hashed_directories = True filter_packages = [ diff --git a/scripts/common-8 b/scripts/common-8 index 601b223..be43e26 100644 --- a/scripts/common-8 +++ b/scripts/common-8 @@ -1 +1 @@ -REVISION="8.6" +REVISION="8.7" diff --git a/scripts/updates-8-extras.sh b/scripts/updates-8-extras.sh index 29f54dd..8b44782 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.6" +LABEL="--production --label RC-8.7" 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 692e165..f3670d0 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.6" +LABEL="--production --label RC-8.7" 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 825c9ba..80d7b2c 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.6" +LABEL="--production --label RC-8.7" 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 b4e4e2b..814c0b2 100755 --- a/scripts/updates-8.sh +++ b/scripts/updates-8.sh @@ -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.6" +LABEL="--production --label RC-8.7" CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL" #COMPOSE_ID="Rocky-8-20210625.n.0"