refactoring and code cleanup

Author: nammn

scripts/minikube/minikube_host.sh

@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 
-# This is a helper script for running tests on s390x Hosts.
-# It allows to configure minikube clusters and expose remote API servers on a local machine to
-# enable local development while running minikube cluster on s390x instance.
-# Run "minikube_host.sh help" command to see the full usage.
-# Similar to evg_host.sh but uses minikube instead of kind.
+# This is a helper script for running tests on IBM Hosts using RHEL and Minikube.
 
 set -Eeou pipefail
 
@@ -16,7 +12,7 @@ source scripts/funcs/install
 
 if [[ -z "${MINIKUBE_HOST_NAME}" ]]; then
   echo "MINIKUBE_HOST_NAME env var is missing"
-  echo "Set it to your s390x host connection string (e.g., user@hostname)"
+  echo "Set it to your IBM RHEL Host host connection string (e.g., user@hostname)"
   exit 1
 fi
 
@@ -35,7 +31,7 @@ kubeconfig_path="${HOME}/.operator-dev/minikube-host.kubeconfig"
 configure() {
   ssh -T -q "${host_url}" "sudo chown \$(whoami):\$(whoami) ~/.docker || true; mkdir -p ~/.docker"
   if [[ -f "${HOME}/.docker/config.json" ]]; then
-    echo "Copying local ~/.docker/config.json authorization credentials to s390x host"
+    echo "Copying local ~/.docker/config.json authorization credentials to IBM RHEL Host host"
     jq '. | with_entries(select(.key == "auths"))' "${HOME}/.docker/config.json" | ssh -T -q "${host_url}" 'cat > ~/.docker/config.json'
   fi
 
@@ -79,7 +75,7 @@ remote-prepare-local-e2e-run() {
 
 get-kubeconfig() {
   # For minikube, we need to get the kubeconfig and certificates
-  echo "Getting kubeconfig from minikube on s390x host..."
+  echo "Getting kubeconfig from minikube on IBM RHEL Host host..."
 
   # Create local minikube directory structure
   mkdir -p "${HOME}/.minikube"
@@ -102,15 +98,6 @@ get-kubeconfig() {
   echo "Copied minikube kubeconfig and certificates to ${kubeconfig_path}"
 }
 
-recreate-minikube-cluster() {
-  configure "$(detect_architecture)" 2>&1| prepend "minikube_host.sh configure"
-  echo "Recreating minikube cluster on ${MINIKUBE_HOST_NAME} (${host_url})..."
-  # shellcheck disable=SC2088
-  ssh -T "${host_url}" "cd ~/mongodb-kubernetes; export KUBE_ENVIRONMENT_NAME=minikube; minikube delete || true; ./scripts/minikube/setup_minikube_host.sh"
-  echo "Copying kubeconfig to ${kubeconfig_path}"
-  get-kubeconfig
-}
-
 tunnel() {
   shift 1
   echo "Setting up tunnel for minikube cluster..."
@@ -175,20 +162,19 @@ usage() {
   minikube_host.sh <command>
 
 PREREQUISITES:
-  - s390x host with SSH access
+  - IBM RHEL Host host with SSH access
   - define MINIKUBE_HOST_NAME env var (e.g., export MINIKUBE_HOST_NAME=user@hostname)
   - SSH key-based authentication configured
 
 COMMANDS:
   configure <architecture>           installs on a host: calls sync, switches context, installs necessary software (auto-detects arch)
   sync                              rsync of project directory
-  recreate-minikube-cluster          recreates minikube cluster and executes get-kubeconfig
   remote-prepare-local-e2e-run       executes prepare-local-e2e on the remote host
   get-kubeconfig                     copies remote minikube kubeconfig locally to ~/.operator-dev/minikube-host.kubeconfig
   tunnel [args]                      creates ssh session with tunneling to all API servers
   ssh [args]                         creates ssh session passing optional arguments to ssh
-  cmd [command with args]            execute command as if being on s390x host
-  upload-my-ssh-private-key          uploads your ssh keys (~/.ssh/id_rsa) to s390x host
+  cmd [command with args]            execute command as if being on IBM RHEL Host host
+  upload-my-ssh-private-key          uploads your ssh keys (~/.ssh/id_rsa) to IBM RHEL Host host
   help                               this message
 
 EXAMPLES:
@@ -200,7 +186,6 @@ EXAMPLES:
 
 case ${cmd} in
 configure) configure "$@" ;;
-recreate-minikube-cluster) recreate-minikube-cluster "$@" ;;
 get-kubeconfig) get-kubeconfig ;;
 remote-prepare-local-e2e-run) remote-prepare-local-e2e-run ;;
 ssh) ssh_to_host "$@" ;;

scripts/minikube/setup_minikube_host.sh

@@ -174,21 +174,6 @@ start_minikube_cluster() {
 setup_podman() {
   echo "Setting up podman for ${ARCH}..."
 
-  # Check if podman is already available
-  if command -v podman &> /dev/null; then
-    echo "✅ Podman already installed"
-
-    # Diagnose podman state
-    echo "=== Podman Diagnostics ==="
-    echo "User: $(whoami), UID: $(id -u)"
-    echo "User namespace support: $(cat /proc/self/uid_map 2>/dev/null || echo 'not available')"
-    echo "Systemctl user status:"
-    systemctl --user status podman.socket 2>/dev/null || echo "podman.socket not active"
-    echo "Running 'sudo podman info' command..."
-    sudo podman info 2>&1
-  fi
-
-
   # Configure podman to use cgroupfs instead of systemd in CI
   mkdir -p ~/.config/containers
   cat > ~/.config/containers/containers.conf << EOF

scripts/release/agent/detect_ops_manager_changes.py

@@ -60,41 +60,6 @@ def extract_ops_manager_mapping(release_data: Dict) -> Dict:
     return release_data.get("supportedImages", {}).get("mongodb-agent", {}).get("opsManagerMapping", {})
 
 
-def _is_later_agent_version(version1: str, version2: str) -> bool:
-    """
-    Compare two agent versions and return True if version1 is later than version2.
-    Agent versions are in format like "13.37.0.9590-1" or "108.0.12.8846-1"
-    """
-    if not version1 or not version2:
-        return False
-
-    def split_version(version: str) -> List[int]:
-        """Split version string into numeric parts, ignoring suffix after '-'"""
-        parts = []
-        version_part = version.split("-")[0]  # Remove suffix like "-1"
-        for part in version_part.split("."):
-            try:
-                parts.append(int(part))
-            except ValueError:
-                # If we can't parse a part as int, skip it
-                continue
-        return parts
-
-    v1_parts = split_version(version1)
-    v2_parts = split_version(version2)
-
-    # Compare each part
-    max_len = max(len(v1_parts), len(v2_parts))
-    for i in range(max_len):
-        v1_part = v1_parts[i] if i < len(v1_parts) else 0
-        v2_part = v2_parts[i] if i < len(v2_parts) else 0
-
-        if v1_part != v2_part:
-            return v1_part > v2_part
-
-    return False  # Versions are equal
-
-
 def get_changed_agents(current_mapping: Dict, base_mapping: Dict) -> List[Tuple[str, str]]:
     """Returns list of (agent_version, tools_version) tuples for added/changed agents"""
     added_agents = []

scripts/release/agent/validation.py

@@ -26,7 +26,8 @@ def agent_info(self):
     def generate_tools_build_args(self, platforms: List[str], tools_version: str) -> Dict[str, str]:
         """
         Generate build arguments for MongoDB tools based on platform mappings.
-        Uses the same validation logic to ensure consistency.
+        The build arguments are based on the agent build info by verifying different
+        filename possibilities for each platform.
 
         Args:
             platforms: List of platforms (e.g., ["linux/amd64", "linux/arm64"])
@@ -82,7 +83,9 @@ def generate_agent_build_args(self, platforms: List[str], agent_version: str, to
             if agent_filename and tools_filename:
                 build_args[f"mongodb_agent_version_{arch}"] = agent_filename
                 build_args[f"mongodb_tools_version_{arch}"] = tools_filename
-                logger.debug(f"Added build args for {platform}: agent={agent_filename}, tools={tools_filename}")
+                logger.debug(
+                    f"Validated agent and tools versions for {platform}: agent={agent_filename}, tools={tools_filename}"
+                )
             else:
                 logger.warning(f"Skipping build args for {platform} - missing agent or tools filename")
                 logger.debug(f"  agent_filename: {agent_filename}")
@@ -95,11 +98,6 @@ def generate_agent_build_args(self, platforms: List[str], agent_version: str, to
 _platform_config = PlatformConfiguration()
 
 
-def load_agent_build_info():
-    """Load agent platform mappings from build_info_agent.json"""
-    return _platform_config.agent_info
-
-
 def generate_tools_build_args(platforms: List[str], tools_version: str) -> Dict[str, str]:
     """Generate build arguments for MongoDB tools based on platform mappings."""
     return _platform_config.generate_tools_build_args(platforms, tools_version)
@@ -179,7 +177,7 @@ def _find_working_filename(
     return ""
 
 
-def _get_available_platforms_with_fallback(
+def _get_available_platforms(
     version: str,
     platforms: List[str],
     base_url: str,
@@ -213,31 +211,6 @@ def _get_available_platforms_with_fallback(
     return available_platforms
 
 
-def get_available_platforms_for_agent(agent_version: str, platforms: List[str]) -> List[str]:
-    """
-    Get the list of platforms where the agent version is actually available.
-    Tries multiple RHEL versions for each platform to find working binaries.
-
-    Args:
-        agent_version: MongoDB agent version to check
-        platforms: List of platforms to check
-
-    Returns:
-        List of platforms where the agent version exists
-    """
-    agent_base_url = (
-        "https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod"
-    )
-
-    return _get_available_platforms_with_fallback(
-        version=agent_version,
-        platforms=platforms,
-        base_url=agent_base_url,
-        filenames_builder=_build_agent_filenames,
-        version_type="agent",
-    )
-
-
 def get_working_agent_filename(agent_version: str, platform: str) -> str:
     """
     Get the actual working agent filename for a specific platform and version.
@@ -272,26 +245,3 @@ def get_working_tools_filename(tools_version: str, platform: str) -> str:
     tools_base_url = "https://fastdl.mongodb.org/tools/db"
 
     return _find_working_filename(tools_version, platform, tools_base_url, _build_tools_filenames, "tools")
-
-
-def get_available_platforms_for_tools(tools_version: str, platforms: List[str]) -> List[str]:
-    """
-    Get the list of platforms where the tools version is actually available.
-    Tries multiple RHEL versions for each platform to find working binaries.
-
-    Args:
-        tools_version: MongoDB tools version to check
-        platforms: List of platforms to check
-
-    Returns:
-        List of platforms where the tools version exists
-    """
-    tools_base_url = "https://fastdl.mongodb.org/tools/db"
-
-    return _get_available_platforms_with_fallback(
-        version=tools_version,
-        platforms=platforms,
-        base_url=tools_base_url,
-        filenames_builder=_build_tools_filenames,
-        version_type="tools",
-    )

scripts/release/atomic_pipeline.py

@@ -22,8 +22,6 @@
 from scripts.release.agent.validation import (
     generate_agent_build_args,
     generate_tools_build_args,
-    get_available_platforms_for_agent,
-    get_available_platforms_for_tools,
 )
 from scripts.release.build.image_build_configuration import ImageBuildConfiguration
 from scripts.release.build.image_build_process import execute_docker_build
@@ -256,13 +254,12 @@ def build_init_appdb_image(build_configuration: ImageBuildConfiguration):
 
     tools_version = extract_tools_version_from_release(release)
 
-    if not get_available_platforms_for_tools(tools_version, build_configuration.platforms):
-        logger.warning(f"Skipping build for init-appdb - tools version {tools_version} not found in repository")
-        return
-
     platform_build_args = generate_tools_build_args(
         platforms=build_configuration.platforms, tools_version=tools_version
     )
+    if not platform_build_args:
+        logger.warning(f"Skipping build for init-appdb - tools version {tools_version} not found in repository")
+        return
 
     args = {
         "version": build_configuration.version,
@@ -282,14 +279,12 @@ def build_init_database_image(build_configuration: ImageBuildConfiguration):
 
     tools_version = extract_tools_version_from_release(release)
 
-    # Validate that the tools version exists before attempting to build
-    if not get_available_platforms_for_tools(tools_version, build_configuration.platforms):
-        logger.warning(f"Skipping build for init-database - tools version {tools_version} not found in repository")
-        return
-
     platform_build_args = generate_tools_build_args(
         platforms=build_configuration.platforms, tools_version=tools_version
     )
+    if not platform_build_args:
+        logger.warning(f"Skipping build for init-database - tools version {tools_version} not found in repository")
+        return
 
     args = {
         "version": build_configuration.version,
@@ -354,57 +349,15 @@ def build_agent(build_configuration: ImageBuildConfiguration):
         logger.info(f"Running with factor of {max_workers}")
         logger.info(f"======= Agent versions to build {agent_versions_to_build} =======")
 
-        successful_builds = []
-        skipped_builds = []
-
         for idx, agent_tools_version in enumerate(agent_versions_to_build):
-            agent_version = agent_tools_version[0]
-            tools_version = agent_tools_version[1]
-
-            available_agent_platforms = get_available_platforms_for_agent(agent_version, build_configuration.platforms)
-            available_tools_platforms = get_available_platforms_for_tools(tools_version, build_configuration.platforms)
-            available_platforms = list(set(available_agent_platforms) & set(available_tools_platforms))
-
-            logger.info(
-                f"======= Building Agent {agent_tools_version} for platforms: {available_platforms}, ({idx + 1}/{len(agent_versions_to_build)})"
-            )
-
-            # Check if amd64 is available - if not, skip the entire build
-            if "linux/amd64" not in available_platforms:
-                logger.warning(
-                    f"Skipping agent version {agent_version} - amd64 platform not available (required platform)"
-                )
-                if available_platforms:
-                    logger.info(f"  Other available platforms were: {available_platforms}")
-                skipped_builds.append(agent_tools_version)
-                continue
-
-            if not available_platforms:
-                logger.warning(
-                    f"Skipping agent version {agent_version} - no platforms available for both agent and tools"
-                )
-                skipped_builds.append(agent_tools_version)
-                continue
-
-            if available_platforms != build_configuration.platforms:
-                logger.info(
-                    f"Building agent {agent_version} for available platforms: {available_platforms} "
-                    f"(skipping: {set(build_configuration.platforms) - set(available_platforms)})"
-                )
-
-            successful_builds.append(agent_tools_version)
             _build_agent(
                 agent_tools_version,
                 build_configuration,
-                available_platforms,
+                build_configuration.platforms,
                 executor,
                 tasks_queue,
             )
 
-    logger.info(f"Build summary: {len(successful_builds)} successful, {len(skipped_builds)} skipped")
-    if skipped_builds:
-        logger.info(f"Skipped versions: {skipped_builds}")
-
     queue_exception_handling(tasks_queue)
 
 
@@ -436,8 +389,6 @@ def build_agent_pipeline(
         f"======== Building agent pipeline for version {agent_version}, build configuration version: {build_configuration.version}"
     )
 
-    # Note: Validation is now done earlier in the build_agent function
-    # Generate platform-specific build arguments using the mapping
     platform_build_args = generate_agent_build_args(
         platforms=available_platforms, agent_version=agent_version, tools_version=tools_version
     )