setup for proper lh and stable

README.md

@@ -9,7 +9,7 @@ koji.
 ```
 * r8   -> Stable for Rocky 8
 * r8s  -> Predicted, Beta, and so one that will be merged into stable
-* r9   -> Stable for Rocky 9
+* r9.X -> Stable for Rocky 9
 * r9s  -> LookAhead variant for Rocky 9
 * r10s -> LookAhead variant for Rocky 10
 ```

rocky-lookahead.conf

@@ -0,0 +1,21 @@
+# This is the default CentOS Stream config template.
+#
+# DO NOT EDIT this configuration file directly.
+#
+# For any change which should be propagated also into CentOS and RHEL
+# compose, edit the particular configuration file in the "shared" directory.
+#
+# For any change which should happen only for CentOS Stream, edit the
+# "centos/override.conf" configuration file.
+
+from shared/variables import *
+from rocky-lookahead/variables import *
+from shared/all import *
+from rocky-lookahead/override import *
+
+image_build = {}
+sigkeys = [None]
+signed_packages_wait = 0
+signed_packages_retries = 0
+
+global_release = '!RELEASE_FROM_DATE_RESPIN'

rocky-lookahead/override.conf

@@ -0,0 +1,39 @@
+# This files overrides default variables defined in the configs in
+# the ../shared directory.
+
+from images import *
+
+# Unsigned builds for now
+sigkeys = [None]
+
+tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
+
+lorax_use_koji_plugin = False
+
+lorax_options = [
+    ("^.*$", {
+        'x86_64': {
+            'nomacboot': True
+        },
+        "*": {
+            "noupgrade": False,
+            "squashfs_only": True,
+            'rootfs_size': 3
+        }
+    })
+]
+
+translate_paths = [ # required by image-build
+    ("/mnt/koji", "https://koji.rockylinux.org/kojifiles")
+]
+
+extra_isos = {
+    "BaseOS": [{
+        "include_variants": ["AppStream"],
+        "filename": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
+        "skip_src": True,
+        "extra_files": EXTRA_FILES,
+        "arches": EXTRA_ISOS_ARCHES,
+        "failable_arches": ['i386']
+    }]
+}

rocky-lookahead/variables.conf

@@ -0,0 +1,51 @@
+# This file sets the values of variables defined in
+# the `../shared/variables.conf`.
+
+RELEASE_NAME = 'Rocky Linux'
+RELEASE_SHORT = 'Rocky'
+RELEASE_VERSION_X = '10'
+RELEASE_VERSION_Y = '0'
+RELEASE_VERSION_XY = "%s.%s" % (RELEASE_VERSION_X, RELEASE_VERSION_Y)
+RELEASE_VERSION = RELEASE_VERSION_XY
+
+PKGSET_KOJI_TAG = 'r10s-compose'
+
+RUNROOT_CHANNEL = 'runroot'
+RUNROOT_TAG = 'r10s-build'
+
+COMPS_REPO = 'https://git.rockylinux.org/rocky/comps.git'
+COMPS_BRANCH = 'main'
+COMPS_FILE = 'comps-rocky-%s-lh.xml' % RELEASE_VERSION_X
+COMPS_COMMAND = ''
+
+VARIANTS_SCM = 'git'
+VARIANTS_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git'
+VARIANTS_BRANCH = 'r%ss' % RELEASE_VERSION_X
+VARIANTS_FILE = 'variants.xml'
+
+GATHER_PREPOPULATE_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git'
+GATHER_PREPOPULATE_BRANCH = 'r%ss' % RELEASE_VERSION_X
+GATHER_PREPOPULATE_FILE = 'prepopulate.json'
+GATHER_PREPOPULATE_COMMAND = ''
+
+EXTRA_FILES = [ 
+    {
+        "scm": "git",
+        "repo": "https://git.rockylinux.org/staging/src/rocky-release.git",
+        "branch": "r10s",
+        "file": [
+            "SOURCES/LICENSE",
+            "SOURCES/EULA",
+            "SOURCES/COMMUNITY-CHARTER",
+            "SOURCES/RPM-GPG-KEY-Rocky-10",
+            "SOURCES/RPM-GPG-KEY-Rocky-10-Testing",
+        ],
+        "target": "",
+    }
+]
+
+EXTRA_BUILDINSTALL_SKIP = ('^BaseOS$', {
+    'i386': True,
+})
+
+EXTRA_ISO_ARCHES = ['aarch64', 'ppc64le', 's390x', 'x86_64']

rocky/variables.conf

@@ -3,26 +3,28 @@
 
 RELEASE_NAME = 'Rocky Linux'
 RELEASE_SHORT = 'Rocky'
-RELEASE_VERSION = '10'
+RELEASE_VERSION_X = '10'
-VERSION = '10-lh'
+RELEASE_VERSION_Y = '0'
+RELEASE_VERSION_XY = "%s.%s" % (RELEASE_VERSION_X, RELEASE_VERSION_Y)
+RELEASE_VERSION = RELEASE_VERSION_XY
 
-PKGSET_KOJI_TAG = 'r10s-compose'
+PKGSET_KOJI_TAG = 'r10-compose'
 
 RUNROOT_CHANNEL = 'runroot'
-RUNROOT_TAG = 'r10s-build'
+RUNROOT_TAG = 'r10-build'
 
 COMPS_REPO = 'https://git.rockylinux.org/rocky/comps.git'
 COMPS_BRANCH = 'main'
-COMPS_FILE = 'comps-rocky-%s.xml' % VERSION
+COMPS_FILE = 'comps-rocky-%s.xml' % RELEASE_VERSION_XY
 COMPS_COMMAND = ''
 
 VARIANTS_SCM = 'git'
 VARIANTS_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-VARIANTS_BRANCH = 'r%ss' % RELEASE_VERSION
+VARIANTS_BRANCH = 'r%s' % RELEASE_VERSION_XY
 VARIANTS_FILE = 'variants.xml'
 
 GATHER_PREPOPULATE_REPO = 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-GATHER_PREPOPULATE_BRANCH = 'r%ss' % RELEASE_VERSION
+GATHER_PREPOPULATE_BRANCH = 'r%s' % RELEASE_VERSION_XY
 GATHER_PREPOPULATE_FILE = 'prepopulate.json'
 GATHER_PREPOPULATE_COMMAND = ''
 
@@ -30,7 +32,7 @@ EXTRA_FILES = [
     {
         "scm": "git",
         "repo": "https://git.rockylinux.org/staging/src/rocky-release.git",
-        "branch": "r10s",
+        "branch": "r10",
         "file": [
             "SOURCES/LICENSE",
             "SOURCES/EULA",