From fbce62795d7f25e3516ea354648fc310fb70f379 Mon Sep 17 00:00:00 2001
From: Matt Davis <nitzmahone@users.noreply.github.com>
Date: Tue, 9 Jan 2018 17:22:24 -0800
Subject: [PATCH] enable Windows Server 2016 in CI (#34127)

* enable Windows Server 2016 in CI
* avoid use of Write-Host in config script
---
 test/integration/host_vars/windows-2016-English-Full-Base | 4 ++++
 test/runner/requirements/constraints.txt                  | 5 ++++-
 test/runner/requirements/windows-integration.txt          | 5 ++++-
 test/utils/shippable/windows.sh                           | 1 +
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/host_vars/windows-2016-English-Full-Base

diff --git a/test/integration/host_vars/windows-2016-English-Full-Base b/test/integration/host_vars/windows-2016-English-Full-Base
new file mode 100644
index 00000000000..b7ee4c30db4
--- /dev/null
+++ b/test/integration/host_vars/windows-2016-English-Full-Base
@@ -0,0 +1,4 @@
+# force 2016 to use NTLM + HTTP message encryption
+ansible_winrm_transport: ntlm
+ansible_winrm_scheme: http
+ansible_port: 5985
diff --git a/test/runner/requirements/constraints.txt b/test/runner/requirements/constraints.txt
index 1161ceb1177..524854cbc89 100644
--- a/test/runner/requirements/constraints.txt
+++ b/test/runner/requirements/constraints.txt
@@ -1,5 +1,5 @@
 coverage >= 4.2, != 4.3.2 # features in 4.2+ required, avoid known bug in 4.3.2 on python 2.6
-pywinrm >= 0.2.1 # 0.1.1 required, but 0.2.1 provides better performance
+pywinrm >= 0.3.0 # message encryption support
 pylint == 1.7.4 ; python_version >= '3.5' # versions before 1.7.1 hang or fail to install on python 3.x
 pylint == 1.6.5 ; python_version <= '2.7' # versions after 1.6.5 hang or fail during test on python 2.x
 sphinx < 1.6 ; python_version < '2.7' # sphinx 1.6 and later require python 2.7 or later
@@ -11,3 +11,6 @@ ncclient >= 0.5.2 # Need features added in 0.5.2 and greater
 idna < 2.6 # requests requires idna < 2.6, but cryptography will cause the latest version to be installed instead
 paramiko < 2.4.0 ; python_version < '2.7' # paramiko 2.4.0 drops support for python 2.6
 pytest < 3.3.0 ; python_version < '2.7' # pytest 3.3.0 drops support for python 2.6
+ntlm-auth >= 1.0.6 # message encryption support
+requests-ntlm >= 1.1.0 # message encryption support
+requests-credssp >= 0.1.0 # message encryption support
diff --git a/test/runner/requirements/windows-integration.txt b/test/runner/requirements/windows-integration.txt
index df57d2a673d..2853f3eb002 100644
--- a/test/runner/requirements/windows-integration.txt
+++ b/test/runner/requirements/windows-integration.txt
@@ -2,5 +2,8 @@ cryptography
 jinja2
 junit-xml
 paramiko
-pywinrm
+ntlm-auth
+requests-ntlm
+requests-credssp
+pywinrm[credssp]
 pyyaml
diff --git a/test/utils/shippable/windows.sh b/test/utils/shippable/windows.sh
index b3f9f5d1b47..c35750be79e 100755
--- a/test/utils/shippable/windows.sh
+++ b/test/utils/shippable/windows.sh
@@ -33,6 +33,7 @@ if [ -s /tmp/windows.txt ] || [ "${CHANGED:+$CHANGED}" == "" ]; then
         --windows 2008-R2_SP1
         --windows 2012-RTM
         --windows 2012-R2_RTM
+        --windows 2016-English-Full-Base
     )
 else
     echo "No changes requiring integration tests specific to Windows were detected."