(ci-cd) fix regression with test images not being built as needed

Author: filippomc

tools/deployment-cli-tools/ch_cli_tools/codefresh.py

@@ -409,15 +409,21 @@ def add_unit_test_step(app_config: ApplicationHarnessConfig):
             codefresh_steps_from_base_path(join(root_path, APPS_PATH), include=helm_values[KEY_TASK_IMAGES].keys())
         codefresh_steps_from_base_path(join(root_path, APPS_PATH), include=build_included)
 
-        if CD_E2E_TEST_STEP in steps and steps[CD_E2E_TEST_STEP].get("scale"):
-            name = "test-e2e"
+    # Search all root_paths for test images after scale is fully populated from all apps.
+    # Test images (test-e2e, test-api) may live in a different root_path than the apps that use them.
+    if CD_E2E_TEST_STEP in steps and steps[CD_E2E_TEST_STEP].get("scale"):
+        name = "test-e2e"
+        for root_path in root_paths:
             if codefresh_steps_from_base_path(join(root_path, TEST_IMAGES_PATH), include=(name,), publish=False):
-                steps[CD_E2E_TEST_STEP]["image"] = image_tag_with_variables(f"{base_name}/{name}", helm_values.registry.name, app_specific_tag_variable(name))
+                steps[CD_E2E_TEST_STEP]["image"] = image_tag_with_variables(
+                    f"{base_image_name}/{name}", helm_values.registry.name, app_specific_tag_variable(name))
 
-        if CD_API_TEST_STEP in steps and steps[CD_API_TEST_STEP].get("scale"):
-            name = "test-api"
+    if CD_API_TEST_STEP in steps and steps[CD_API_TEST_STEP].get("scale"):
+        name = "test-api"
+        for root_path in root_paths:
             if codefresh_steps_from_base_path(join(root_path, TEST_IMAGES_PATH), include=(name,), fixed_context=relpath(root_path, os.getcwd()), publish=False):
-                steps[CD_API_TEST_STEP]["image"] = image_tag_with_variables(f"{base_name}/{name}", helm_values.registry.name, app_specific_tag_variable(name))
+                steps[CD_API_TEST_STEP]["image"] = image_tag_with_variables(
+                    f"{base_image_name}/{name}", helm_values.registry.name, app_specific_tag_variable(name))
 
     if build_steps:
 

tools/deployment-cli-tools/tests/test_codefresh.py

@@ -188,6 +188,60 @@ def test_create_codefresh_configuration_multienv():
         shutil.rmtree(BUILD_MERGE_DIR)
 
 
+def test_test_images_built_only_when_tests_exist_in_project_apps():
+    """Test images are built iff the corresponding test type is enabled on at least one app.
+
+    Positive case: app in RESOURCES (not CH) with e2e enabled → test-e2e must be built even
+    though the test image lives in cloud-harness (root_paths[0]).
+
+    Negative case: same app without e2e enabled → test-e2e must NOT be built.
+
+    Regression: the test image search was done per root_path, so if the apps with tests are in
+    root_path[1] (project) and the test images are in root_path[0] (cloud-harness), the images
+    were never found because scale was empty when root_path[0] was scanned.
+    """
+    def _build_steps(e2e_enabled):
+        values = create_helm_chart(
+            [CLOUDHARNESS_ROOT, RESOURCES],
+            output_path=OUT,
+            include=['myapp'],
+            exclude=['events'],
+            domain="my.local",
+            namespace='test',
+            env=['dev', 'test'],
+            local=False,
+            tag=1,
+            registry='reg'
+        )
+        root_paths = preprocess_build_overrides(
+            root_paths=[CLOUDHARNESS_ROOT, RESOURCES],
+            helm_values=values,
+            merge_build_path=BUILD_MERGE_DIR
+        )
+        build_included = [app['harness']['name']
+                          for app in values['apps'].values() if 'harness' in app]
+        values.apps["myapp"].harness.test.e2e.enabled = e2e_enabled
+        cf = create_codefresh_deployment_scripts(root_paths, include=build_included,
+                                                 envs=['dev', 'test'],
+                                                 base_image_name=values['name'],
+                                                 helm_values=values, save=False)
+        l1_steps = cf['steps']
+        return {name: step for build_step in [STEP_0, STEP_1, STEP_2, STEP_3]
+                if build_step in l1_steps
+                for name, step in l1_steps[build_step]['steps'].items()}
+
+    try:
+        with_tests = _build_steps(e2e_enabled=True)
+        assert "test-e2e" in with_tests, \
+            "test-e2e image must be built when a project app has e2e tests, even if the image lives in cloud-harness"
+
+        without_tests = _build_steps(e2e_enabled=False)
+        assert "test-e2e" not in without_tests, \
+            "test-e2e image must NOT be built when no app has e2e tests enabled"
+    finally:
+        shutil.rmtree(BUILD_MERGE_DIR, ignore_errors=True)
+
+
 def test_create_codefresh_configuration_tests():
     values = create_helm_chart(
         [CLOUDHARNESS_ROOT, RESOURCES],