removing pipeline and atomic matrix

Author: nammn

.evergreen.yml

@@ -34,7 +34,6 @@ variables:
       - name: build_init_om_images_ubi
         variant: init_test_run
 
-
   - &base_no_om_image_dependency
     depends_on:
       - name: build_om_images
@@ -52,7 +51,6 @@ variables:
       - name: build_init_appdb_images_ubi
         variant: init_test_run
 
-
   - &community_dependency
     depends_on:
       - name: build_operator_ubi
@@ -151,7 +149,6 @@ variables:
       - name: build_init_om_images_ubi
         variant: init_test_run
 
-
   - &base_om7_dependency_with_race
     depends_on:
       - name: build_om_images
@@ -169,7 +166,6 @@ variables:
       - name: build_init_om_images_ubi
         variant: init_test_run
 
-
   - &base_om8_dependency
     depends_on:
       - name: build_om_images

pipeline.py

@@ -1242,11 +1242,7 @@ def build_multi_arch_agent_in_sonar(
     )
 
 
-def build_agent_default_case(build_configuration: BuildConfiguration):
-    """
-    Build the agent only for the latest operator for patches and operator releases.
-
-    """
+def build_agent(build_configuration: BuildConfiguration):
     agent_versions_to_build = detect_ops_manager_changes()
     if not agent_versions_to_build:
         logger.info("No changes detected, skipping agent build")
@@ -1348,8 +1344,8 @@ def get_builder_function_for_image_name() -> Dict[str, Callable]:
         "upgrade-hook": build_upgrade_hook_image,
         "operator-quick": build_operator_image_patch,
         "database": build_database_image,
-        "agent-pct": build_agent_default_case,
-        "agent": build_agent_default_case,
+        "agent-pct": build_agent,
+        "agent": build_agent,
         #
         # Init images
         "init-appdb": build_init_appdb,

scripts/detect_ops_manager_changes.py

@@ -20,7 +20,7 @@ def get_content_from_git(commit: str, file_path: str) -> Optional[str]:
         return None
 
 
-def load_base_release_json() -> Optional[Dict]:
+def load_release_json_from_master() -> Optional[Dict]:
     base_revision = "origin/master"
 
     content = get_content_from_git(base_revision, "release.json")
@@ -81,13 +81,13 @@ def detect_ops_manager_changes() -> List[Tuple[str, str]]:
         print("ERROR: Could not load current local release.json")
         return []
 
-    base_release = load_base_release_json()
-    if not base_release:
+    master_release = load_release_json_from_master()
+    if not master_release:
         print("WARNING: Could not load base release.json, assuming changes exist")
         return []
 
     current_mapping = extract_ops_manager_mapping(current_release)
-    base_mapping = extract_ops_manager_mapping(base_release)
+    base_mapping = extract_ops_manager_mapping(master_release)
 
     if current_mapping != base_mapping:
         return get_changed_agents(current_mapping, base_mapping)

scripts/test_detect_ops_manager_changes.py

@@ -127,8 +127,7 @@ def test_no_changes_detected(self):
             patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
-            has_changes, changed_agents = detect_ops_manager_changes()
-            self.assertFalse(has_changes)
+            changed_agents = detect_ops_manager_changes()
             self.assertEqual(changed_agents, [])
 
     def test_new_ops_manager_version_added(self):
@@ -144,8 +143,7 @@ def test_new_ops_manager_version_added(self):
             patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
-            has_changes, changed_agents = detect_ops_manager_changes()
-            self.assertTrue(has_changes)
+            changed_agents = detect_ops_manager_changes()
             self.assertIn(("108.0.0.8694-1", "100.10.0"), changed_agents)
 
     def test_ops_manager_version_modified(self):
@@ -160,8 +158,7 @@ def test_ops_manager_version_modified(self):
             patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
-            has_changes, changed_agents = detect_ops_manager_changes()
-            self.assertTrue(has_changes)
+            changed_agents = detect_ops_manager_changes()
             self.assertIn(("12.0.35.7911-1", "100.10.0"), changed_agents)
 
     def test_cloud_manager_changed(self):
@@ -174,8 +171,7 @@ def test_cloud_manager_changed(self):
             patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
-            has_changes, changed_agents = detect_ops_manager_changes()
-            self.assertTrue(has_changes)
+            changed_agents = detect_ops_manager_changes()
             self.assertIn(("13.38.0.9600-1", "100.12.2"), changed_agents)
 
     def test_cloud_manager_tools_changed(self):
@@ -188,8 +184,7 @@ def test_cloud_manager_tools_changed(self):
             patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
-            has_changes, changed_agents = detect_ops_manager_changes()
-            self.assertTrue(has_changes)
+            changed_agents = detect_ops_manager_changes()
             self.assertIn(("13.37.0.9590-1", "100.13.0"), changed_agents)
 
     def test_ops_manager_version_removed(self):
@@ -202,8 +197,8 @@ def test_ops_manager_version_removed(self):
             patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
-            has_changes, changed_agents = detect_ops_manager_changes()
-            self.assertTrue(has_changes)
+            changed_agents = detect_ops_manager_changes()
+            self.assertEqual(changed_agents, [])
 
     def test_both_om_and_cm_changed(self):
         """Test detection when both OM version and cloud manager are changed"""
@@ -219,8 +214,7 @@ def test_both_om_and_cm_changed(self):
             patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
-            has_changes, changed_agents = detect_ops_manager_changes()
-            self.assertTrue(has_changes)
+            changed_agents = detect_ops_manager_changes()
             self.assertIn(("108.0.0.8694-1", "100.10.0"), changed_agents)
             self.assertIn(("13.38.0.9600-1", "100.12.2"), changed_agents)
             self.assertEqual(len(changed_agents), 2)
@@ -232,8 +226,7 @@ def test_current_release_load_failure(self):
             patch("detect_ops_manager_changes.load_release_json_from_master", return_value=self.master_release_data),
         ):
 
-            has_changes, changed_agents = detect_ops_manager_changes()
-            self.assertFalse(has_changes)
+            changed_agents = detect_ops_manager_changes()
             self.assertEqual(changed_agents, [])
 
     def test_base_release_load_failure_fail_safe(self):
@@ -243,8 +236,7 @@ def test_base_release_load_failure_fail_safe(self):
             patch("detect_ops_manager_changes.load_release_json_from_master", return_value=None),
         ):
 
-            has_changes, changed_agents = detect_ops_manager_changes()
-            self.assertTrue(has_changes)
+            changed_agents = detect_ops_manager_changes()
             self.assertEqual(changed_agents, [])