address feedback

Author: nammn

.evergreen.yml

@@ -288,7 +288,7 @@ tasks:
       - func: lint_repo
 
   # Runs on every merge - detects release.json changes and releases appropriate images
-  - name: release_on_merge
+  - name: release_om_and_agents
     allowed_requesters: [ "patch" , "commit"]
     commands:
       - func: clone
@@ -301,7 +301,7 @@ tasks:
           working_dir: src/github.com/mongodb/mongodb-kubernetes
           binary: scripts/dev/run_python.sh
           args:
-            - scripts/release/release_on_merge.py
+            - scripts/release/release_om_and_agents.py
 
   - name: migrate_all_agents
     # this enables us to run this variant manually to build all the agents for the new agent registry
@@ -754,7 +754,7 @@ task_groups:
       - e2e_sharded_cluster_scram_sha_256_switch_project
       - e2e_replica_set_scram_sha_1_switch_project
       - e2e_sharded_cluster_scram_sha_1_switch_project
-      # TODO CLOUDP-349093 - Disabled these tests as they don't use the password secret, and project migrations aren't fully supported yet.  
+      # TODO CLOUDP-349093 - Disabled these tests as they don't use the password secret, and project migrations aren't fully supported yet.
       # e2e_sharded_cluster_x509_switch_project
       # e2e_replica_set_x509_switch_project
       # e2e_replica_set_ldap_switch_project
@@ -1969,11 +1969,11 @@ buildvariants:
       - name: migrate_all_agents
 
   # Runs on every merge to master and releases images auxiliary to the operator release like OM and the Agent
-  - name: release_on_merge
-    display_name: release_on_merge
+  - name: release_om_and_agents
+    display_name: release_om_and_agents
     allowed_requesters: [ "patch" , "commit"]
     run_on:
       - release-ubuntu2404-small
     patchable: false  # Only run on commit builds
     tasks:
-      - name: release_on_merge
+      - name: release_om_and_agents

scripts/release/release_on_merge.py renamed to scripts/release/release_om_and_agents.py

@@ -11,16 +11,18 @@
 skip_if_exists handles already-published images.
 
 Usage:
-    python release_on_merge.py [--dry-run]
+    python release_om_and_agents.py [--dry-run]
 """
 import json
 import logging
-import re
 import subprocess
 import sys
 from pathlib import Path
 from typing import Dict, List
 
+import semver
+import yaml
+
 logging.basicConfig(
     level=logging.INFO,
     format="%(asctime)s - %(levelname)s - %(message)s",
@@ -92,7 +94,7 @@ def get_ops_manager_mapping(release_data: Dict) -> Dict:
 
 def get_latest_om_versions_from_evergreen_yaml() -> Dict[str, str]:
     """
-    Extract OM versions from .evergreen.yml anchors.
+    Extract OM versions from .evergreen.yml anchors
 
     Returns: {"60": "6.0.27", "70": "7.0.19", "80": "8.0.16"}
     """
@@ -103,16 +105,24 @@ def get_latest_om_versions_from_evergreen_yaml() -> Dict[str, str]:
         logger.error(".evergreen.yml not found")
         return versions
 
-    content = evergreen_path.read_text()
-
-    # Match patterns like: - &ops_manager_60_latest 6.0.27 #
-    pattern = r"-\s*&ops_manager_(\d+)_latest\s+(\S+)\s+#"
-
-    for match in re.finditer(pattern, content):
-        major = match.group(1)  # "60", "70", "80"
-        version = match.group(2)  # "6.0.27", "7.0.19", "8.0.16"
-        versions[major] = version
-        logger.info(f"Found OM {major}: {version}")
+    with open(evergreen_path, "r") as f:
+        data = yaml.safe_load(f)
+
+    # Extract version strings from the variables list
+    # The YAML structure is: variables: [6.0.27, 7.0.19, 8.0.16, ...]
+    variables = data.get("variables", [])
+
+    for var in variables:
+        # Try to parse as semver
+        try:
+            version_info = semver.VersionInfo.parse(var)
+            # Use major*10 + minor as the key (e.g., 6.0.x -> "60", 7.0.x -> "70")
+            major_key = f"{version_info.major}{version_info.minor}"
+            versions[major_key] = var
+            logger.info(f"Found OM {major_key}: {var}")
+        except ValueError:
+            # Not a valid semver string, skip it
+            continue
 
     return versions
 
@@ -198,7 +208,8 @@ def main():
             if not release_agent(agent_version, tools_version, f"OM {om_version}", args.dry_run):
                 success = False
         else:
-            logger.warning(f"No agent found for OM {om_version} in release.json")
+            logger.critical(f"No agent found for OM {om_version} in release.json")
+            sys.exit(1)
 
     # Always print summary
     print_summary(args.dry_run)