From 7ed67746cfe2f1b90d5bb6f8e4852eaa29d3e91b Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Wed, 18 Jan 2017 18:20:07 -0800
Subject: [PATCH] Enable Windows 2016 on Shippable.

Also launch Windows instances on us-east-2 and all others on us-east-1.
---
 test/runner/lib/core_ci.py      | 2 +-
 test/utils/shippable/windows.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/runner/lib/core_ci.py b/test/runner/lib/core_ci.py
index 4812f55011d..d8adf834f34 100644
--- a/test/runner/lib/core_ci.py
+++ b/test/runner/lib/core_ci.py
@@ -71,7 +71,7 @@ class AnsibleCoreCI(object):
                 self.ci_key += '.%s' % args.remote_aws_region
             elif is_shippable():
                 # split Shippable jobs across multiple regions to maximize use of launch credits
-                if self.platform == 'freebsd':
+                if self.platform == 'windows':
                     region = 'us-east-2'
                 else:
                     region = 'us-east-1'
diff --git a/test/utils/shippable/windows.sh b/test/utils/shippable/windows.sh
index 8b5d4c4e585..030f36d65b2 100755
--- a/test/utils/shippable/windows.sh
+++ b/test/utils/shippable/windows.sh
@@ -26,7 +26,9 @@ if [ -s /tmp/windows.txt ]; then
         --windows 2008-SP2 \
         --windows 2008-R2_SP1 \
         --windows 2012-RTM \
-        --windows 2012-R2_RTM
+        --windows 2012-R2_RTM \
+        --windows 2016-English-Full-Base \
+
 else
     echo "No changes requiring integration tests specific to Windows were detected."
     echo "Running Windows integration tests for a single version only."