preliminary: fix syncs for 9

Author: nazunalika

mangle/koji/branch_tag.py

@@ -10,14 +10,17 @@
 parser.add_argument('--minor', type=str, required=True,
                     choices=('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'))
 parser.add_argument('--riscv', action='store_true')
+parser.add_argument('--modularity', action='store_true')
 
 results = parser.parse_args()
 MAJOR = results.major
 MINOR = results.minor
 RISCV = results.riscv
+MODULES = results.modules
 RELEASE = f'{MAJOR}.{MINOR}'
 PREFIX = f'dist-rocky{RELEASE}'
 TOOLS = f'dist-rocky{MAJOR}-build-tools'
+MODULE_BUILD = f'module-rocky{RELEASE}-build'
 DEFAULT_ARCHES = 'x86_64 aarch64 ppc64le s390x'
 
 # RelEng: Every build tag will have repo.auto. Even though this isn't
@@ -31,10 +34,14 @@
 RISCV_EXTRA = {**DEFAULT_EXTRA, **RISCV_NOARCH}
 RISCV_UPDATES_EXTRA = {**UPDATES_EXTRA, **RISCV_NOARCH}
 KIWI = {**DEFAULT_EXTRA, 'mock.new_chroot': 0}
+MODULE_EXTRA = {
+        'rpm.macro.distribution': f'Rocky Linux {MAJOR}',
+        'rpm.macro.vendor': 'Rocky Enterprise Software Foundation',
+}
 
 # RelEng: riscv64 has separate build tags until we have more hardware or
 # hardware that can actually build things in a relatively decent amount of
-# time. Please keep them separate for now.
+# time. Having separate build tags is important for this in particular.
 TARGETS = {
         # Standard build tags
         f'{PREFIX}-build': {
@@ -173,6 +180,11 @@
 try:
     print('!! Creating compose tag')
     session.createTag(f'{PREFIX}-compose', parent=PREFIX)
+
+    if MODULES:
+        print('!! Creating module build tag')
+        session.createTag(f'{MODULE_BUILD}', arches=DEFAULT_ARCHES, extra=MODULE_EXTRA)
+
 except koji.GenericError as exc:
     print(exc)
     print('There was an error; exiting to prevent further problems')

sync/common_9

@@ -27,13 +27,15 @@ esac
 MAJOR="${REVISION%.*}"
 MINOR="${REVISION#*.}"
 ARCHES=(x86_64 aarch64 ppc64le s390x)
+ISO_TYPES=(BaseOS Minimal)
+IMAGE_TYPES=(images live)
 STAGING_ROOT="/mnt/repos-staging"
 PRODUCTION_ROOT="/mnt/repos-production"
 
 # relative to ${ENV}_ROOT
 CATEGORY_STUB="mirror/pub/rocky"
 RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}"
-RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}/latest-${SHORT}-${MAJOR}${COMPOSE_APPEND}"
+RELEASE_COMPOSE_ROOT="${COMPOSE_ROOT}/${MAJOR}${COMPOSE_APPEND}/latest-${SHORT}-${MAJOR}"
 
 # Set all repos that have no comps/groups associated with them. This is even in
 # cases where repos will not be available by normal means. It's just for
@@ -70,6 +72,8 @@ ALL_REPOS=(
 
 NONSIG_COMPOSE=(
   Rocky
+  Extras
+  Rocky-devel
 )
 
 declare -A SIG_COMPOSE
@@ -82,7 +86,6 @@ SIG_COMPOSE=(
 export MODS=(
   AppStream
   CRB
-  devel
 )
 
 # functions
@@ -127,17 +130,18 @@ function treeinfoModder() {
 from configparser import ConfigParser
 config = ConfigParser()
 config.read('${TREEINFO_VAR}')
-config.set('tree', 'variants', 'BaseOS,AppStream')
-config.add_section('variant-AppStream')
-config.set('variant-AppStream', 'id', 'AppStream')
-config.set('variant-AppStream', 'name', 'AppStream')
-config.set('variant-AppStream', 'type', 'variant')
-config.set('variant-AppStream', 'uid', 'AppStream')
-config.set('variant-AppStream', 'packages', '../../../AppStream/${BaseOSArch}/os/Packages')
-config.set('variant-AppStream', 'repository', '../../../AppStream/${BaseOSArch}/os/')
-
-with open('${TREEINFO_VAR}', 'w') as configfile:
-    config.write(configfile)
+if 'variant-AppStream' not in config.sections():
+    config.set('tree', 'variants', 'BaseOS,AppStream')
+    config.add_section('variant-AppStream')
+    config.set('variant-AppStream', 'id', 'AppStream')
+    config.set('variant-AppStream', 'name', 'AppStream')
+    config.set('variant-AppStream', 'type', 'variant')
+    config.set('variant-AppStream', 'uid', 'AppStream')
+    config.set('variant-AppStream', 'packages', '../../../AppStream/${BaseOSArch}/os/Packages')
+    config.set('variant-AppStream', 'repository', '../../../AppStream/${BaseOSArch}/os/')
+
+    with open('${TREEINFO_VAR}', 'w') as configfile:
+        config.write(configfile)
 EOF
   else
     echo "${TREEINFO_VAR}, or python3 does not exist on this system."
@@ -164,24 +168,30 @@ function treeinfoModderKickstart() {
 from configparser import ConfigParser
 config = ConfigParser()
 config.read('${TREEINFO_VAR}')
-config.set('tree', 'variants', 'BaseOS,AppStream')
-config.add_section('variant-AppStream')
-config.set('variant-AppStream', 'id', 'AppStream')
-config.set('variant-AppStream', 'name', 'AppStream')
-config.set('variant-AppStream', 'type', 'variant')
-config.set('variant-AppStream', 'uid', 'AppStream')
-config.set('variant-AppStream', 'packages', '../../../AppStream/${BaseOSArch}/kickstart/Packages')
-config.set('variant-AppStream', 'repository', '../../../AppStream/${BaseOSArch}/kickstart/')
-
-with open('${TREEINFO_VAR}', 'w') as configfile:
-    config.write(configfile)
+if 'variant-AppStream' not in config.sections():
+    config.set('tree', 'variants', 'BaseOS,AppStream')
+    config.add_section('variant-AppStream')
+    config.set('variant-AppStream', 'id', 'AppStream')
+    config.set('variant-AppStream', 'name', 'AppStream')
+    config.set('variant-AppStream', 'type', 'variant')
+    config.set('variant-AppStream', 'uid', 'AppStream')
+    config.set('variant-AppStream', 'packages', '../../../AppStream/${BaseOSArch}/kickstart/Packages')
+    config.set('variant-AppStream', 'repository', '../../../AppStream/${BaseOSArch}/kickstart/')
+    with open('${TREEINFO_VAR}', 'w') as configfile:
+        config.write(configfile)
+else:
+    config.set('variant-AppStream', 'packages', '../../../AppStream/${BaseOSArch}/kickstart/Packages')
+    config.set('variant-AppStream', 'repository', '../../../AppStream/${BaseOSArch}/kickstart/')
+
+    with open('${TREEINFO_VAR}', 'w') as configfile:
+        config.write(configfile)
 EOF
   else
     echo "${TREEINFO_VAR}, or python3 does not exist on this system."
   fi
   /bin/cp "${TREEINFO_VAR}" "${PRISTINE_TREE}"
 }
 
-#export -f treeinfoFixer
-#export -f treeinfoModder
-#export -f treeinfoModderKickstart
+export -f treeinfoFixer
+export -f treeinfoModder
+export -f treeinfoModderKickstart

sync/minor-release-sync-to-staging.sh

@@ -10,11 +10,6 @@ source $(dirname "$0")/common
 # Major Version (eg, 8)
 MAJ=${RLVER}
 
-if [ "${MAJ}" -eq "9" ]; then
-  echo "Does not work for Rocky Linux 9. Please use sync-to-staging"
-  exit 32
-fi
-
 # sync all pieces of a release, including extras, nfv, etc
 for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
   echo "${COMPOSE}: Syncing"

sync/sync-to-staging.sh

@@ -12,10 +12,6 @@ if [[ $# -eq 0 ]]; then
   exit 1
 fi
 
-if [[ "${RLVER}" -eq "8" ]]; then
-  echo "This is only used for Rocky Linux 8 and 10 releases."
-fi
-
 # Major Version (eg, 8)
 #MAJ=${RLVER}