Merge pull request #46975 from gtmanfred/windows

Make windows work for test runs in jenkinsci

.kitchen.yml

@@ -38,7 +38,7 @@ provisioner:
     - 139
   max_retries: 2
   remote_states:
-    name: git://github.com/saltstack/salt-jenkins.git
+    name: git://github.com/gtmanfred/salt-jenkins.git
     branch: 2017.7
     repo: git
     testingdir: /testing
@@ -151,6 +151,8 @@ platforms:
         $OldPath = (Get-ItemProperty -Path $Reg -Name PATH).Path
         $NewPath= $OldPath + ";" + $AddedLocation
         Set-ItemProperty -Path $Reg -Value $NewPath -Name PATH
+        reg add "hklm\system\currentcontrolset\control\session manager\memory management" /v pagingfiles /t reg_multi_sz /d "d:\pagefile.sys 4096 8192" /f
+        winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="5000"}'
       salt_bootstrap_url: https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.ps1
       salt_bootstrap_options: ''
     verifier:
@@ -178,6 +180,8 @@ platforms:
         $OldPath = (Get-ItemProperty -Path $Reg -Name PATH).Path
         $NewPath= $OldPath + ";" + $AddedLocation
         Set-ItemProperty -Path $Reg -Value $NewPath -Name PATH
+        reg add "hklm\system\currentcontrolset\control\session manager\memory management" /v pagingfiles /t reg_multi_sz /d "d:\pagefile.sys 4096 8192" /f
+        winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="5000"}'
       salt_bootstrap_url: https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.ps1
       salt_bootstrap_options: ''
     verifier:
@@ -185,7 +189,9 @@ platforms:
       types:
         - unit
       coverage_xml: false
+      xml: /tmp/xml-unittests-output/
       save:
+        /tmp/xml-unittests-output/: artifacts/
         $env:TEMP/salt-runtests.log: artifacts/logs/salt-runtests.log
         /salt/var/log/salt/minion: artifacts/logs/minion
 <% end %>

Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'test-kitchen', '~>1.20'
+gem 'test-kitchen', :git => 'https://github.com/gtmanfred/test-kitchen.git'
 gem 'kitchen-salt', :git => 'https://github.com/saltstack/kitchen-salt.git'
 gem 'kitchen-sync'
 gem 'git'
@@ -20,7 +20,7 @@ group :windows do
   gem 'vagrant-wrapper'
   gem 'kitchen-vagrant'
   gem 'winrm', '~>2.0'
-  gem 'winrm-fs', '>=1.1.1'
+  gem 'winrm-fs', :git => 'https://github.com/gtmanfred/winrm-fs.git'
 end
 
 group :ec2 do

pkg/windows/req.txt

@@ -12,7 +12,6 @@ idna==2.5
 ioloop==0.1a0
 ipaddress==1.0.18
 Jinja2==2.9.6
-libnacl==1.6.1
 lxml==3.7.3
 Mako==1.0.6
 MarkupSafe==1.0

tests/support/paths.py

@@ -127,7 +127,7 @@ class ScriptPathMixin(object):
                 sfh.write(
                     '#!{0}\n\n'.format(sys.executable) +
                     'import sys\n' +
-                    'CODE_DIR="{0}"\n'.format(CODE_DIR) +
+                    'CODE_DIR = r"{0}"\n'.format(CODE_DIR) +
                     'if CODE_DIR not in sys.path:\n' +
                     '    sys.path.insert(0, CODE_DIR)\n\n' +
                     '\n'.join(script_template).format(script_name.replace('salt-', ''))