se "higher stream" rather than Y-Stream

For EUS branches the base release number comes from the higher Z-Stream,
not Y-Stream. Even though the code works with EUS branches just fine,
variables and functions still reference Y-Stream which is not accurate.

Signed-off-by: Nikola Forró <[email protected]>

Author: nforro

agents/tests/unit/test_tools.py

@@ -137,22 +137,17 @@ def autorelease_spec(tmp_path):
     [False, True],
 )
 @pytest.mark.parametrize(
-    "dist_git_branch, ystream_dist",
-    [
-        ("c9s", ".el9"),
-        ("c10s", ".el10"),
-        ("rhel-9.6.0", ".el9"),
-        ("rhel-10.0", ".el10"),
-    ],
+    "dist_git_branch",
+    ["c9s", "c10s", "rhel-9.6.0", "rhel-10.0"],
 )
 @pytest.mark.asyncio
-async def test_update_release(rebase, dist_git_branch, ystream_dist, minimal_spec, autorelease_spec):
+async def test_update_release(rebase, dist_git_branch, minimal_spec, autorelease_spec):
     package = "test"
 
-    async def _get_latest_ystream_build(*_, **__):
-        return EVR(version="0.1", release="2" + ystream_dist)
+    async def _get_latest_higher_stream_build(*_, **__):
+        return EVR(version="0.1", release="2.elX")
 
-    flexmock(UpdateReleaseTool).should_receive("_get_latest_ystream_build").replace_with(_get_latest_ystream_build)
+    flexmock(UpdateReleaseTool).should_receive("_get_latest_higher_stream_build").replace_with(_get_latest_higher_stream_build)
 
     tool = UpdateReleaseTool()
 

agents/tools/specfile.py

@@ -81,17 +81,17 @@ def _process_zstream_branch(dist_git_branch: str) -> tuple[str, str] | None:
         if not (m := re.match(r"^(?P<prefix>rhel-(?P<x>\d+)\.)(?P<y>\d+)(?P<suffix>\.\d+)?$", dist_git_branch)):
             # not a Z-Stream branch
             return None
-        ystream_candidate_tag = (
+        higher_stream_candidate_tag = (
             m.group("prefix")
             # y++, up to 10 (highest RHEL minor version)
             + str(min(int(m.group("y")) + 1, 10))
             + (m.group("suffix") or "")
             + "-candidate"
         )
-        return ystream_candidate_tag
+        return higher_stream_candidate_tag
 
     @staticmethod
-    async def _get_latest_ystream_build(package: str, candidate_tag: str) -> EVR:
+    async def _get_latest_higher_stream_build(package: str, candidate_tag: str) -> EVR:
         builds = await asyncio.to_thread(
             koji.ClientSession(BREWHUB_URL).listTagged,
             package=package,
@@ -101,7 +101,7 @@ async def _get_latest_ystream_build(package: str, candidate_tag: str) -> EVR:
             strict=True,
         )
         if not builds:
-            raise RuntimeError(f"There are no Y-Stream builds of {package} in {candidate_tag}")
+            raise RuntimeError(f"There are no builds of {package} in {candidate_tag}")
         [build] = builds
         return EVR(epoch=build["epoch"] or 0, version=build["version"], release=build["release"])
 
@@ -119,11 +119,10 @@ async def _set_zstream_release(
         spec_path: Path,
         package: str,
         rebase: bool,
-        ystream_candidate_tag: str,
+        higher_stream_candidate_tag: str,
     ) -> None:
-        latest_ystream_build = await cls._get_latest_ystream_build(package, ystream_candidate_tag)
-        ystream_base_release, suffix = latest_ystream_build.release.rsplit(".el", maxsplit=1)
-        ystream_release_suffix = f".el{suffix}"
+        latest_higher_stream_build = await cls._get_latest_higher_stream_build(package, higher_stream_candidate_tag)
+        higher_stream_base_release, _ = latest_higher_stream_build.release.rsplit(".el", maxsplit=1)
         with Specfile(spec_path) as spec:
             current_release = spec.raw_release
         nodes = list(ValueParser.flatten(ValueParser.parse(current_release)))
@@ -147,8 +146,8 @@ def find_macro(name):
                 # %autorelease after %dist, most likely already a Z-Stream release, no change needed
                 release = current_release
             else:
-                # no %dist or %autorelease before it, let's create a new release based on Y-Stream
-                release = ystream_base_release + "%{?dist}.%{autorelease -n}"
+                # no %dist or %autorelease before it, let's create a new release based on the higher stream
+                release = higher_stream_base_release + "%{?dist}.%{autorelease -n}"
         else:
             if rebase:
                 # no %autorelease, rebase, reset the release
@@ -163,8 +162,8 @@ def find_macro(name):
                     # no %autorelease and existing Z-Stream counter after %dist, increase it
                     release = prefix + "." + str(int(m.group(1)) + 1)
                 else:
-                    # invalid Z-Stream counter, let's try to create a new release based on Y-Stream
-                    release = ystream_base_release + "%{?dist}.1"
+                    # invalid Z-Stream counter, let's try to create a new release based on the higher stream
+                    release = higher_stream_base_release + "%{?dist}.1"
             else:
                 # no %autorelease, %dist present, add Z-Stream counter
                 release = current_release + ".1"
@@ -180,10 +179,15 @@ async def _run(
     ) -> StringToolOutput:
         spec_path = get_absolute_path(tool_input.spec, self)
         try:
-            if not (ystream_candidate_tag := self._process_zstream_branch(tool_input.dist_git_branch)):
+            if not (higher_stream_candidate_tag := self._process_zstream_branch(tool_input.dist_git_branch)):
                 await self._bump_or_reset_release(spec_path, tool_input.rebase)
             else:
-                await self._set_zstream_release(spec_path, tool_input.package, tool_input.rebase, ystream_candidate_tag)
+                await self._set_zstream_release(
+                    spec_path,
+                    tool_input.package,
+                    tool_input.rebase,
+                    higher_stream_candidate_tag,
+                )
         except Exception as e:
             raise ToolError(f"Failed to update release: {e}") from e
         return StringToolOutput(result=f"Successfully updated release in {spec_path}")