Merge pull request #316 from bryceml/7zip

use 7zip to create the zip archive
saltstack · Sep 24, 2020 · 91fc0be · 91fc0be
2 parents 2bb6bff + 9c87d40
commit 91fc0be
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/kitchen/verifier/nox.rb b/lib/kitchen/verifier/nox.rb
@@ -203,9 +203,14 @@ def call(state)
                 if config[:windows]
                   if config[:zip_windows_artifacts]
                     begin
-                      conn.execute("powershell Compress-Archive #{remote} #{remote}artifacts.zip -Force")
+                      conn.execute("7z.exe a #{remote}artifacts.zip #{remote}")
                     rescue => e
-                      error("Failed to create zip")
+                      begin
+                        info("7z.exe failed, attempting zip with powershell Compress-Archive")
+                        conn.execute("powershell Compress-Archive #{remote} #{remote}artifacts.zip -Force")
+                      rescue => e2
+                        error("Failed to create zip")
+                      end
                     end
                   end
                 else