diff --git a/container.conf b/container.conf index 44f260e..a2986ce 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.9'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.10'] # CHECKSUMS media_checksums = ['sha256'] @@ -72,7 +72,7 @@ image_build = { "format": [("docker", "tar.gz")], "name": "Rocky-8-Container", "target": "image-rocky-8", - "version": "8.9", + "version": "8.10", "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.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"], }, "factory-parameters": { diff --git a/extras-lh.conf b/extras-lh.conf index 36b8748..5fed8b2 100644 --- a/extras-lh.conf +++ b/extras-lh.conf @@ -31,7 +31,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.9'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.10'] hashed_directories = True check_deps = False diff --git a/extras.conf b/extras.conf index cb55485..0fadd40 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.9'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.10'] hashed_directories = True check_deps = False diff --git a/rocky-beta.conf b/rocky-beta.conf index 2008460..4a49e7e 100644 --- a/rocky-beta.conf +++ b/rocky-beta.conf @@ -27,6 +27,6 @@ image_name_format = { ".*": "{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}', ] diff --git a/rocky-lh.conf b/rocky-lh.conf index e4a121b..e97033c 100644 --- a/rocky-lh.conf +++ b/rocky-lh.conf @@ -27,6 +27,6 @@ image_name_format = { ".*": "{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}', ] diff --git a/rocky/images.conf b/rocky/images.conf index ee6e290..855cd2e 100644 --- a/rocky/images.conf +++ b/rocky/images.conf @@ -3,7 +3,7 @@ # '^Workstation$': [ # { # 'name': 'Rocky-Workstation-8', -# 'version': '8.9', +# 'version': '8.10', # '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.9", + "version": "8.10", "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.9", + "version": "8.10", "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 b034873..d77c51d 100644 --- a/rocky/variables.conf +++ b/rocky/variables.conf @@ -2,8 +2,8 @@ RELEASE_NAME = 'Rocky Linux' RELEASE_SHORT = 'Rocky' -RELEASE_VERSION = '8.9' -VERSION = '8.9' +RELEASE_VERSION = '8.10' +VERSION = '8.10' 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.9' +MODULE_DEFAULTS_BRANCH = 'r8.10' VARIANTS_SCM = 'git' VARIANTS_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git' diff --git a/scripts/common-8 b/scripts/common-8 index d1c3a4d..8ca1cb6 100644 --- a/scripts/common-8 +++ b/scripts/common-8 @@ -1,5 +1,5 @@ MAJOR="8" -REVISION="8.9" +REVISION="8.10" FROMMAIL="Compose Tracker " TOMAIL="releng@rockylinux.org" diff --git a/scripts/updates-8-extras.sh b/scripts/updates-8-extras.sh index 82e682f..8a24f7e 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.9" +LABEL="--production --label RC-8.10" 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 7890e15..02c18ac 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.9" +LABEL="--production --label RC-8.10" CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL" #COMPOSE_ID="Rocky-8-20210625.n.0" diff --git a/scripts/updates-8.sh b/scripts/updates-8.sh index 2c1a9c8..0a20552 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.9" +LABEL="--production --label RC-8.10" 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 8655fe7..9ebde3d 100644 --- a/shared/buildinstall.conf +++ b/shared/buildinstall.conf @@ -10,12 +10,12 @@ lorax_options = [ ] image_name_format = { - "^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}", + "^BaseOS$": "{release_short}-8.10-{arch}-{disc_type}{disc_num}{suffix}", + "^Minimal$": "{release_short}-8.10-{arch}-minimal{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 = [ ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|RT|NFV)$", { diff --git a/shared/createrepo.conf b/shared/createrepo.conf index a19c27a..738ff70 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.9'] +createrepo_extra_args = ['--distro=cpe:/o:rocky:rocky:8,Rocky Linux 8', '--revision=8.10'] diff --git a/shared/extra_isos.conf b/shared/extra_isos.conf index 5dd78a9..d4a36ae 100644 --- a/shared/extra_isos.conf +++ b/shared/extra_isos.conf @@ -1,13 +1,13 @@ extra_isos = { "BaseOS": [{ "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, "failable_arches": ['i386', 'i686'] }], "Minimal": [{ "include_variants": ["BaseOS"], - "filename": "{release_short}-8.9-{arch}-minimal{suffix}", + "filename": "{release_short}-8.10-{arch}-minimal{suffix}", "skip_src": True, "failable_arches": ['i386', 'i686'] }]