change release folder

Author: nammn

pipeline.py

@@ -42,7 +42,6 @@
 import docker
 from lib.base_logger import logger
 from lib.sonar.sonar import process_image
-from scripts.detect_ops_manager_changes import detect_ops_manager_changes
 from scripts.evergreen.release.agent_matrix import (
     get_supported_version_for_image,
 )
@@ -52,6 +51,7 @@
     sign_image,
     verify_signature,
 )
+from scripts.release.detect_ops_manager_changes import detect_ops_manager_changes
 
 TRACER = trace.get_tracer("evergreen-agent")
 

scripts/release/atomic_pipeline.py

@@ -15,17 +15,17 @@
 from packaging.version import Version
 
 from lib.base_logger import logger
-from scripts.detect_ops_manager_changes import (
-    detect_ops_manager_changes,
-    get_all_agents_for_rebuild,
-)
 from scripts.release.build.image_build_configuration import ImageBuildConfiguration
 from scripts.release.build.image_build_process import execute_docker_build
 from scripts.release.build.image_signing import (
     mongodb_artifactory_login,
     sign_image,
     verify_signature,
 )
+from scripts.release.detect_ops_manager_changes import (
+    detect_ops_manager_changes,
+    get_all_agents_for_rebuild,
+)
 
 TRACER = trace.get_tracer("evergreen-agent")
 

scripts/detect_ops_manager_changes.py renamed to scripts/release/detect_ops_manager_changes.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-Tests for detect_ops_manager_changes.py
+Tests for scripts.release.detect_ops_manager_changes.py
 """
 import json
 import os
@@ -9,9 +9,7 @@
 import unittest
 from unittest.mock import MagicMock, mock_open, patch
 
-# Add the scripts directory to the path so we can import the module
-sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-from detect_ops_manager_changes import (
+from scripts.release.detect_ops_manager_changes import (
     detect_ops_manager_changes,
     extract_ops_manager_mapping,
     get_content_from_git,
@@ -130,8 +128,8 @@ def test_safe_git_show_failure(self, mock_run):
     def test_no_changes_detected(self):
         """Test when no changes are detected"""
         with (
-            patch("detect_ops_manager_changes.load_current_release_json", return_value=self.current_release_data),
-            patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
+            patch("scripts.release.detect_ops_manager_changes.load_current_release_json", return_value=self.current_release_data),
+            patch("scripts.release.detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
             changed_agents = detect_ops_manager_changes()
@@ -146,8 +144,8 @@ def test_new_ops_manager_version_added(self):
         }
 
         with (
-            patch("detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
-            patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
+            patch("scripts.release.detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
+            patch("scripts.release.detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
             changed_agents = detect_ops_manager_changes()
@@ -161,8 +159,8 @@ def test_ops_manager_version_modified(self):
         ] = "12.0.35.7911-1"
 
         with (
-            patch("detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
-            patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
+            patch("scripts.release.detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
+            patch("scripts.release.detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
             changed_agents = detect_ops_manager_changes()
@@ -174,8 +172,8 @@ def test_cloud_manager_changed(self):
         modified_current["supportedImages"]["mongodb-agent"]["opsManagerMapping"]["cloud_manager"] = "13.38.0.9600-1"
 
         with (
-            patch("detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
-            patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
+            patch("scripts.release.detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
+            patch("scripts.release.detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
             changed_agents = detect_ops_manager_changes()
@@ -187,8 +185,8 @@ def test_cloud_manager_tools_changed(self):
         modified_current["supportedImages"]["mongodb-agent"]["opsManagerMapping"]["cloud_manager_tools"] = "100.13.0"
 
         with (
-            patch("detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
-            patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
+            patch("scripts.release.detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
+            patch("scripts.release.detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
             changed_agents = detect_ops_manager_changes()
@@ -200,8 +198,8 @@ def test_ops_manager_version_removed(self):
         del modified_current["supportedImages"]["mongodb-agent"]["opsManagerMapping"]["ops_manager"]["7.0.11"]
 
         with (
-            patch("detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
-            patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
+            patch("scripts.release.detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
+            patch("scripts.release.detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
             changed_agents = detect_ops_manager_changes()
@@ -217,8 +215,8 @@ def test_both_om_and_cm_changed(self):
         modified_current["supportedImages"]["mongodb-agent"]["opsManagerMapping"]["cloud_manager"] = "13.38.0.9600-1"
 
         with (
-            patch("detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
-            patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
+            patch("scripts.release.detect_ops_manager_changes.load_current_release_json", return_value=modified_current),
+            patch("scripts.release.detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
             changed_agents = detect_ops_manager_changes()
@@ -229,8 +227,8 @@ def test_both_om_and_cm_changed(self):
     def test_current_release_load_failure(self):
         """Test handling when current release.json cannot be loaded"""
         with (
-            patch("detect_ops_manager_changes.load_current_release_json", return_value=None),
-            patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
+            patch("scripts.release.detect_ops_manager_changes.load_current_release_json", return_value=None),
+            patch("scripts.release.detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
             changed_agents = detect_ops_manager_changes()
@@ -239,8 +237,8 @@ def test_current_release_load_failure(self):
     def test_base_release_load_failure_fail_safe(self):
         """Test fail-safe behavior when base release.json cannot be loaded"""
         with (
-            patch("detect_ops_manager_changes.load_current_release_json", return_value=self.current_release_data),
-            patch("detect_ops_manager_changes.load_release_json_from_master", return_value=None),
+            patch("scripts.release.detect_ops_manager_changes.load_current_release_json", return_value=self.current_release_data),
+            patch("scripts.release.detect_ops_manager_changes.load_release_json_from_master", return_value=None),
         ):
 
             changed_agents = detect_ops_manager_changes()