Add service_name to deploy_s2i_app

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
sclorg · Jun 12, 2024 · c2ee5d0 · c2ee5d0
1 parent 9520839
commit c2ee5d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/container_ci_suite/imagestreams.py b/container_ci_suite/imagestreams.py
@@ -40,6 +40,7 @@ def __init__(self, working_dir: Path = Path(".")):
 
     def get_latest_version(self) -> str:
         latest_version = ""
+        print(f"Working dir for latest imagestream is {self.working_dir}.")
         with open(self.working_dir / "Makefile") as f:
             for line in f:
                 if not line.startswith("VERSIONS ="):

diff --git a/container_ci_suite/openshift.py b/container_ci_suite/openshift.py
@@ -484,11 +484,12 @@ def imagestream_quickstart(
             openshift_args=openshift_args
         )
 
-    def deploy_s2i_app(self, image_name: str, app: str, context: str) -> bool:
+    def deploy_s2i_app(self, image_name: str, app: str, context: str, service_name: str = "") -> bool:
         tagged_image = utils.get_tagged_image(image_name=image_name, version=self.version)
         print(f"Source image {image_name} was tagged as {tagged_image}")
         self.upload_image(source_image=image_name, tagged_image=tagged_image)
-        service_name = utils.get_service_image(image_name)
+        if service_name == "":
+            service_name = utils.get_service_image(image_name)
         print(f"Service name in app is: {service_name}")
         app_param = app
         if Path(app).is_dir():