Add ability to unsign driver before packaging

Use --package-with-driver=unsigned to remove signature
from the driver before including.

Signed-off-by: Kostiantyn Kostiuk <kkostiuk@redhat.com>

Author: kostyanf14

lib/cli.rb

@@ -79,7 +79,7 @@ class CliTestOptions < T::Struct
     prop :drivers, T::Array[String], default: []
     prop :driver_path, T.nilable(String)
     prop :supplemental_path, T.nilable(String)
-    prop :package_with_driver, T::Boolean, default: false
+    prop :package_with_driver, Symbol, default: :none
     prop :commit, T.nilable(String)
     prop :svvp, T::Boolean, default: false
     prop :dump, T::Boolean, default: false
@@ -129,9 +129,12 @@ def define_options(parser)
                 'Path to the supplemental content folder (e.g. for README)',
                 &method(:supplemental_path=))
 
-      parser.on('--package-with-driver', TrueClass,
+      parser.on('--package-with-driver [package_action]', %i[keep unsigned],
                 'Include driver files in HLKX package (requires --driver-path)',
-                &method(:package_with_driver=))
+                'Use --package-with-driver or --package-with-driver=keep to include driver with original signature',
+                'Use --package-with-driver=unsigned to remove signature from the driver before including') do |pa|
+        self.package_with_driver = pa || :keep
+      end
 
       parser.on('-c', '--commit <commit_hash>', String,
                 'Commit hash for CI status update',

lib/engines/hcktest/tests.rb

@@ -646,7 +646,7 @@ def upload_package_asset(type, path)
 
     sig { returns(T.nilable(String)) }
     def prepare_package_driver_content
-      return unless @project.options.test.package_with_driver
+      return if @project.options.test.package_with_driver == :none
 
       upload_package_asset('Driver', @project.options.test.driver_path)
     end
@@ -656,14 +656,28 @@ def prepare_package_supplemental_content
       upload_package_asset('Supplemental', @project.options.test.supplemental_path)
     end
 
+    def print_project_package_results(res)
+      messages = (res['messages'] || []).map { "    -- #{_1}\n" }.join
+      if res['iserror'] == false
+        @logger.info('Project package successfully created')
+        @logger.debug("Project package creation result:\n#{messages}")
+      else
+        @logger.warn('Project package creation got an error. Check the logs for details.')
+        @logger.warn("Project package creation result:\n#{messages}")
+      end
+    end
+
     def create_project_package
-      package_playlist = @playlist.playlist if @project.options.test.package_with_playlist
+      test_options = @project.options.test
+      package_playlist = @playlist.playlist if test_options.package_with_playlist
 
       remote_driver_path = prepare_package_driver_content
       remote_supplemental_path = prepare_package_supplemental_content
 
-      res = @tools.create_project_package(@tag, package_playlist, nil, remote_driver_path, remote_supplemental_path)
-      @logger.info('Results package successfully created')
+      res = @tools.create_project_package(@tag, package_playlist, nil, remote_driver_path, remote_supplemental_path,
+                                          remove_driver_signatures: test_options.package_with_driver == :unsigned)
+      print_project_package_results(res)
+
       r_name = @tag + File.extname(res['hostprojectpackagepath'])
       @project.result_uploader.upload_file(res['hostprojectpackagepath'], r_name)
     end

lib/engines/hcktest/tools.rb

@@ -378,9 +378,13 @@ def zip_test_result_logs(...)
       retry
     end
 
-    def create_project_package(project, playlist = nil, handler = nil, driver_path = nil, supplemental_path = nil) # rubocop:disable Metrics/ParameterLists
+    def create_project_package(project, playlist = nil, handler = nil, driver_path = nil, supplemental_path = nil, # rubocop:disable Metrics/ParameterLists
+                               remove_driver_signatures: false)
       retry_tools_command(__method__) do
-        act_with_tools { _1.create_project_package(project, playlist, handler, driver_path, supplemental_path) }
+        act_with_tools do |tools|
+          tools.create_project_package(project, playlist, handler, driver_path, supplemental_path,
+                                       remove_driver_signatures:)
+        end
       end
     end