CH-207 fix images path - reverts CH-194

Author: filippomc

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

@@ -11,7 +11,7 @@
 from .models import HarnessMainConfig, ApplicationTestConfig, ApplicationHarnessConfig
 from cloudharness_utils.constants import *
 from .configurationgenerator import KEY_APPS, KEY_TASK_IMAGES, KEY_TEST_IMAGES
-from .utils import check_image_exists_in_registry, clean_image_name, find_dockerfiles_paths, get_app_relative_to_base_path, guess_build_dependencies_from_dockerfile, \
+from .utils import check_image_exists_in_registry, find_dockerfiles_paths, get_app_relative_to_base_path, guess_build_dependencies_from_dockerfile, \
     get_image_name, get_template, dict_merge, app_name_from_path, clean_path
 from cloudharness_utils.testing.api import get_api_filename, get_schemathesis_command, get_urls_from_api_file
 
@@ -132,7 +132,7 @@ def create_codefresh_deployment_scripts(root_paths, envs=(), include=(), exclude
     for i in range(len(root_paths)):
 
         root_path = root_paths[i]
-        base_name = clean_image_name(basename(abspath(root_path))) if i < len(root_paths) - (2 if has_overrides else 1) else base_image_name
+        base_name = base_image_name
 
         for e in envs:
 

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

@@ -17,7 +17,7 @@
     DEPLOYMENT_CONFIGURATION_PATH, BASE_IMAGES_PATH, STATIC_IMAGES_PATH
 from .utils import get_cluster_ip, env_variable, get_sub_paths, guess_build_dependencies_from_dockerfile, image_name_from_dockerfile_path, \
     get_template, merge_configuration_directories, dict_merge, app_name_from_path, \
-    find_dockerfiles_paths, clean_image_name
+    find_dockerfiles_paths
 
 
 KEY_HARNESS = 'harness'
@@ -96,7 +96,7 @@ def _adjust_missing_values(self, helm_values):
     def _process_applications(self, helm_values, base_image_name=None):
         for i in range(len(self.root_paths)):
             root_path = self.root_paths[i]
-            base_name = clean_image_name(root_path.name) if i < len(self.root_paths) - 1 else base_image_name
+            base_name = base_image_name
             app_values = init_app_values(
                 root_path, exclude=self.exclude, values=helm_values[KEY_APPS])
             helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
@@ -152,7 +152,7 @@ def collect_app_values(self, app_base_path, base_image_name=None, helm_values=No
     def _init_static_images(self, base_image_name):
         for i in range(len(self.root_paths)):
             root_path = self.root_paths[i]
-            base_name = clean_image_name(root_path.name) if i < len(self.root_paths) - 1 else base_image_name
+            base_name = base_image_name
             for static_img_dockerfile in find_dockerfiles_paths(os.path.join(root_path, STATIC_IMAGES_PATH)):
                 self.static_images.add(static_img_dockerfile)
 
@@ -185,7 +185,7 @@ def _assign_static_build_dependencies(self, helm_values):
     def _init_base_images(self, base_image_name):
         for i in range(len(self.root_paths)):
             root_path = self.root_paths[i]
-            base_name = clean_image_name(root_path.name) if i < len(self.root_paths) - 1 else base_image_name
+            base_name = base_image_name
 
             for base_img_dockerfile in self.__find_static_dockerfile_paths(root_path):
                 img_name = image_name_from_dockerfile_path(
@@ -201,7 +201,7 @@ def _init_test_images(self, base_image_name):
         test_images = {}
         for i in range(len(self.root_paths)):
             root_path = self.root_paths[i]
-            base_name = clean_image_name(root_path.name) if i < len(self.root_paths) - 1 else base_image_name
+            base_name = base_image_name
 
             for base_img_dockerfile in find_dockerfiles_paths(os.path.join(root_path, TEST_IMAGES_PATH)):
                 img_name = image_name_from_dockerfile_path(