Avoid HCK classes during installation

HCK is not yet available during installation so avoid using it.

Signed-off-by: Akihiko Odaki <[email protected]>

lib/engines/hckinstall/hckinstall.rb

@@ -196,10 +196,10 @@ def run_studio(scope, iso_list = [], keep_alive:, snapshot: true)
         attach_iso_list: iso_list
       }
 
-      @project.setup_manager.run_hck_studio(scope, st_opts)
+      @project.setup_manager.run_studio(scope, st_opts)
     end
 
-    def run_client(scope, studio, name, snapshot: true)
+    def run_client(scope, name, snapshot: true)
       cl_opts = {
         create_snapshot: snapshot,
         attach_iso_list: [
@@ -208,7 +208,7 @@ def run_client(scope, studio, name, snapshot: true)
         ]
       }
 
-      @project.setup_manager.run_hck_client(scope, studio, name, cl_opts)
+      @project.setup_manager.run_client(scope, name, cl_opts)
     end
 
     def run_studio_installer
@@ -226,19 +226,19 @@ def run_studio_installer
       end
     end
 
-    def run_client_installer(scope, studio, name)
+    def run_client_installer(scope, name)
       @project.setup_manager.create_client_image(name)
 
-      run_client(scope, studio, name, snapshot: false)
+      run_client(scope, name, snapshot: false)
     end
 
     def run_clients_installer
       ResourceScope.open do |scope|
-        st = run_studio(scope, [], keep_alive: true)
-        cl = @clients_name.map { |c| run_client_installer(scope, st, c) }
+        run_studio(scope, [], keep_alive: true)
+        cl = @clients_name.map { |c| [c, run_client_installer(scope, c)] }
         Timeout.timeout(@client_install_timeout) do
-          cl.each do |client|
-            @logger.info("Waiting for #{client.name} installation finished")
+          cl.each do |name, client|
+            @logger.info("Waiting for #{name} installation finished")
             sleep 5 while client.alive?
           end
         end