CH-169 tests and fixes

Author: filippomc

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

@@ -322,11 +322,13 @@ def add_unit_test_step(app_config: ApplicationHarnessConfig):
     steps = codefresh["steps"]
     if CD_E2E_TEST_STEP in steps and not steps[CD_E2E_TEST_STEP]["scale"]:
         del steps[CD_E2E_TEST_STEP]
-        del steps[CD_BUILD_STEP_TEST]["steps"]["test-e2e"]
+        if CD_BUILD_STEP_TEST in steps and 'test-e2e' in steps[CD_BUILD_STEP_TEST]["steps"]:
+            del steps[CD_BUILD_STEP_TEST]["steps"]["test-e2e"]
 
     if CD_API_TEST_STEP in steps and not steps[CD_API_TEST_STEP]["scale"]:
         del steps[CD_API_TEST_STEP]
-        del steps[CD_BUILD_STEP_TEST]["steps"]["test-api"]
+        if CD_BUILD_STEP_TEST in steps and 'test-api' in steps[CD_BUILD_STEP_TEST]["steps"]:
+            del steps[CD_BUILD_STEP_TEST]["steps"]["test-api"]
 
     if CD_BUILD_STEP_TEST in steps and not steps[CD_BUILD_STEP_TEST]["steps"]:
         del steps[CD_BUILD_STEP_TEST]

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

@@ -190,13 +190,13 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None, helm_
         else:
             build_dependencies = []
 
-        deployment_values = values[KEY_HARNESS].get(KEY_DEPLOYMENT, {})
+        deployment_values = values.get(KEY_HARNESS, {}).get(KEY_DEPLOYMENT, {})
         deployment_image = deployment_values.get('image', None) or values.get('image', None)
         values['build'] = not bool(deployment_image)  # Used by skaffold and ci/cd to determine if the image should be built
         if len(image_paths) > 0 and not deployment_image:
             image_name = image_name_from_dockerfile_path(os.path.relpath(
                 image_paths[0], os.path.dirname(app_path)), base_image_name)
-            deployment_values['image'] = self.image_tag(
+            values['image'] = self.image_tag(
                 image_name, build_context_path=app_path, dependencies=build_dependencies)
         elif KEY_HARNESS in values and not deployment_image and values[
                 KEY_HARNESS].get(KEY_DEPLOYMENT, {}).get('auto', False):

tools/deployment-cli-tools/tests/resources/applications/myapp/deploy/values-nobuild.yaml

@@ -0,0 +1,5 @@
+harness:
+  dependencies:
+    build: []
+  deployment:
+    image: "custom-image"

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

@@ -282,3 +282,39 @@ def test_create_codefresh_configuration_tests():
 
     finally:
         shutil.rmtree(BUILD_MERGE_DIR)
+
+
+def test_create_codefresh_configuration_nobuild():
+    values = create_helm_chart(
+        [RESOURCES],
+        output_path=OUT,
+        include=['myapp'],
+        exclude=['events'],
+        domain="my.local",
+        namespace='test',
+        env=['dev', 'nobuild'],
+        local=False,
+        tag=1,
+        registry='reg'
+    )
+
+    root_paths = preprocess_build_overrides(
+        root_paths=[CLOUD_HARNESS_PATH, 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]
+
+    cf = create_codefresh_deployment_scripts(root_paths, include=build_included,
+                                             envs=['dev', 'nobuild'],
+                                             base_image_name=values['name'],
+                                             helm_values=values, save=False)
+    l1_steps = cf['steps']
+    steps = l1_steps["build_application_images"]["steps"]
+    assert len(steps) == 1
+    assert "myapp" not in steps
+    assert "myapp-mytask" in steps
+    assert "publish_myapp" not in l1_steps["publish"]["steps"]
+    assert "publish_myapp-mytask" in l1_steps["publish"]["steps"]

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

@@ -17,13 +17,6 @@ def test_collect_helm_values(tmp_path):
                                exclude=['events'], domain="my.local",
                                namespace='test', env='dev', local=False, tag=1, registry='reg')
 
-    # Auto values
-    assert values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image'] == 'reg/cloudharness/myapp:1'
-    assert values.apps['myapp'].harness.deployment.image == 'reg/cloudharness/myapp:1'
-    assert values[KEY_APPS]['myapp'][KEY_HARNESS]['name'] == 'myapp'
-    assert values[KEY_APPS]['legacy'][KEY_HARNESS]['name'] == 'legacy'
-    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['image'] == 'reg/cloudharness/accounts:1'
-
     # First level include apps
     assert 'samples' in values[KEY_APPS]
     assert 'myapp' in values[KEY_APPS]
@@ -41,6 +34,14 @@ def test_collect_helm_values(tmp_path):
     # Explicit exclude overrides include
     assert 'events' not in values[KEY_APPS]
 
+    # Auto values
+    assert values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image'] == 'reg/cloudharness/myapp:1'
+    assert values[KEY_APPS]['myapp']['build'] == True
+    assert values.apps['myapp'].harness.deployment.image == 'reg/cloudharness/myapp:1'
+    assert values[KEY_APPS]['myapp'][KEY_HARNESS]['name'] == 'myapp'
+    assert values[KEY_APPS]['legacy'][KEY_HARNESS]['name'] == 'legacy'
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['image'] == 'reg/cloudharness/accounts:1'
+
     # Base values kept
     assert values[KEY_APPS]['accounts'][KEY_HARNESS]['subdomain'] == 'accounts'
 
@@ -79,6 +80,15 @@ def test_collect_helm_values(tmp_path):
     assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES]
 
 
+def test_collect_nobuild(tmp_path):
+    out_folder = tmp_path / 'test_collect_helm_values'
+    values = create_helm_chart([RESOURCES], output_path=out_folder, include=['myapp'],
+                               exclude=['events'], domain="my.local",
+                               namespace='test', env='nobuild', local=False, tag=1, registry='reg')
+    assert values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image'] == 'custom-image'
+    assert values[KEY_APPS]['myapp']['build'] == False
+
+
 def test_collect_helm_values_noreg_noinclude(tmp_path):
     out_path = tmp_path / 'test_collect_helm_values_noreg_noinclude'
     values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_path, domain="my.local",

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

@@ -180,3 +180,37 @@ def test_create_skaffold_configuration_with_conflicting_dependencies_requirement
 
     myapp_config = release['overrides']['apps']['myapp2']
     assert myapp_config['harness']['deployment']['args'][0] == '/usr/src/app/myapp_code/__main__.py'
+
+
+def test_create_skaffold_configuration_nobuild():
+    values = create_helm_chart(
+        [RESOURCES],
+        output_path=OUT,
+        include=['myapp'],
+        domain="my.local",
+        namespace='test',
+        env='nobuild',
+        local=False,
+        tag=1,
+        registry='reg'
+    )
+
+    BUILD_DIR = "/tmp/build"
+    root_paths = preprocess_build_overrides(
+        root_paths=[CLOUDHARNESS_ROOT, RESOURCES],
+        helm_values=values,
+        merge_build_path=BUILD_DIR
+    )
+
+    sk = create_skaffold_configuration(
+        root_paths=root_paths,
+        helm_values=values,
+        output_path=OUT
+    )
+    releases = sk['deploy']['helm']['releases']
+
+    assert len(sk['build']['artifacts']) == 1
+    assert len(releases) == 1  # Ensure we only found 1 deployment (for myapp)
+
+    release = releases[0]
+    assert 'myapp' not in release['overrides']['apps']