CH-207 fix tests

Author: filippomc

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

@@ -64,7 +64,7 @@ def test_create_codefresh_configuration():
         assert "testprojectname/" in steps["cloudharness-base"]['image_name'], "cloudharness-base image should be overridden and take the main name"
         assert "cloudharness-base-debian" not in steps, "cloudharness-base image should not be included"
         assert "cloudharness-frontend-build" in steps, "cloudharness-frontend-build image should be included as dependency"
-        assert "cloud-harness/" in steps["cloudharness-frontend-build"]['image_name'], "cloudharness-frontend-build image is not overridden and should keep the cloud-harness prefix"
+        assert "testprojectname/" in steps["cloudharness-frontend-build"]['image_name'], "cloudharness-frontend-build image is not overridden"
 
         step = steps["cloudharness-frontend-build"]
         assert os.path.samefile(step['working_directory'], CLOUDHARNESS_ROOT)
@@ -122,8 +122,8 @@ def test_create_codefresh_configuration():
         assert "testprojectname/" in step['image_name'], f"myapp image should have the project name coming from the chart in its path, is {step['image_name']}"
         for build_argument in step['build_arguments']:
             if build_argument.startswith("CLOUDHARNESS_FLASK="):
-                assert "cloud-harness" in build_argument, "Cloudharness flask image should have cloud-harness in its path"
-                assert build_argument == "CLOUDHARNESS_FLASK=${{REGISTRY}}/cloud-harness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}", "Dependency is not properly set in the build arguments"
+                assert "testprojectname" in build_argument, "Cloudharness flask image should have cloud-harness in its path"
+                assert build_argument == "CLOUDHARNESS_FLASK=${{REGISTRY}}/testprojectname/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}", "Dependency is not properly set in the build arguments"
 
         assert os.path.samefile(step['working_directory'], os.path.join(
             RESOURCES, APPS_PATH, "myapp"))

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

@@ -40,7 +40,7 @@ def test_collect_helm_values(tmp_path):
     assert values.apps['myapp'].harness.deployment.image == 'reg/testprojectname/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/cloud-harness/accounts:1'
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['image'] == 'reg/testprojectname/accounts:1'
 
     # Base values kept
     assert values[KEY_APPS]['accounts'][KEY_HARNESS]['subdomain'] == 'accounts'
@@ -74,9 +74,9 @@ def test_collect_helm_values(tmp_path):
     # Checl base and task images
     assert values[KEY_TASK_IMAGES]
     assert 'cloudharness-base' in values[KEY_TASK_IMAGES]
-    assert values[KEY_TASK_IMAGES]['cloudharness-base'] == 'reg/testprojectname/cloudharness-base:1', "Cloudharness base image is overridden, so takes the main project name prefix"
+    assert values[KEY_TASK_IMAGES]['cloudharness-base'] == 'reg/testprojectname/cloudharness-base:1'
     assert values[KEY_TASK_IMAGES]['myapp-mytask'] == 'reg/testprojectname/myapp-mytask:1'
-    assert values[KEY_TASK_IMAGES]['cloudharness-flask'] == 'reg/cloud-harness/cloudharness-flask:1'
+    assert values[KEY_TASK_IMAGES]['cloudharness-flask'] == 'reg/testprojectname/cloudharness-flask:1'
     # Not indicated as a build dependency
     assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES]
 
@@ -103,7 +103,7 @@ def test_collect_helm_values_noreg_noinclude(tmp_path):
     assert values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image'] == 'testprojectname/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'] == 'cloud-harness/accounts:1'
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['image'] == 'testprojectname/accounts:1'
 
     # First level include apps
     assert 'samples' in values[KEY_APPS]

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

@@ -59,15 +59,15 @@ def test_create_skaffold_configuration(tmp_path):
     assert overrides[KEY_APPS]['samples'][KEY_HARNESS][KEY_DEPLOYMENT]['args']
 
     assert 'reg' == artifact_overrides[KEY_APPS]['accounts'][KEY_HARNESS][KEY_DEPLOYMENT]['image'][0:3]
-    assert 'harness' in artifact_overrides[KEY_APPS]['accounts'][KEY_HARNESS][KEY_DEPLOYMENT]['image']
+    assert 'harness' not in artifact_overrides[KEY_APPS]['accounts'][KEY_HARNESS][KEY_DEPLOYMENT]['image']
 
     cloudharness_base_artifact = next(
         a for a in sk['build']['artifacts'] if a['image'] == f'reg/testprojectname/cloudharness-base')
     assert cloudharness_base_artifact['context'] == BUILD_DIR
     assert 'requires' not in cloudharness_base_artifact
 
     cloudharness_flask_artifact = next(
-        a for a in sk['build']['artifacts'] if a['image'] == f'reg/{CLOUDHARNESS_DIRNAME}/cloudharness-flask')
+        a for a in sk['build']['artifacts'] if a['image'] == f'reg/testprojectname/cloudharness-flask')
 
     assert os.path.samefile(cloudharness_flask_artifact['context'],
                             join(CLOUDHARNESS_ROOT, 'infrastructure/common-images/cloudharness-flask')
@@ -76,7 +76,7 @@ def test_create_skaffold_configuration(tmp_path):
     assert len(cloudharness_flask_artifact['requires']) == 1
 
     samples_artifact = next(
-        a for a in sk['build']['artifacts'] if a['image'] == f'reg/{CLOUDHARNESS_DIRNAME}/samples'
+        a for a in sk['build']['artifacts'] if a['image'] == f'reg/testprojectname/samples'
     )
     assert os.path.samefile(samples_artifact['context'], join(CLOUDHARNESS_ROOT, 'applications/samples'))
     assert 'TEST_ARGUMENT' in samples_artifact['docker']['buildArgs']
@@ -89,14 +89,14 @@ def test_create_skaffold_configuration(tmp_path):
     assert myapp_artifact['hooks']['before'], 'The hook for dependencies should be included'
     assert len(myapp_artifact['hooks']['before']) == 2, 'The hook for dependencies should include 2 clone commands'
     accounts_artifact = next(
-        a for a in sk['build']['artifacts'] if a['image'] == f'reg/{CLOUDHARNESS_DIRNAME}/accounts')
+        a for a in sk['build']['artifacts'] if a['image'] == f'reg/testprojectname/accounts')
     assert os.path.samefile(accounts_artifact['context'], '/tmp/build/applications/accounts')
 
     # Custom unit tests
     assert len(sk['test']) == 2, 'Unit tests should be included'
 
     samples_test = sk['test'][0]
-    assert samples_test['image'] == f'reg/{CLOUDHARNESS_DIRNAME}/samples', 'Unit tests for samples should be included'
+    assert samples_test['image'] == f'reg/testprojectname/samples', 'Unit tests for samples should be included'
     assert "samples/test" in samples_test['custom'][0]['command'], "The test command must come from values.yaml test/unit/commands"
 
     assert len(sk['test'][1]['custom']) == 2