diff options
| author | Matt Clay <matt@mystile.com> | 2017-01-18 18:20:07 -0800 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2017-01-18 18:37:42 -0800 |
| commit | 7ed67746cfe2f1b90d5bb6f8e4852eaa29d3e91b (patch) | |
| tree | b6b9dbf49ea1ea2c3b9638ab20118b8399b45c59 | |
| parent | 5b9eb927221d8146295d8d4d1a125fe26299f7ad (diff) | |
| download | ansible-7ed67746cfe2f1b90d5bb6f8e4852eaa29d3e91b.tar.gz | |
Enable Windows 2016 on Shippable.
Also launch Windows instances on us-east-2 and all others on us-east-1.
| -rw-r--r-- | test/runner/lib/core_ci.py | 2 | ||||
| -rwxr-xr-x | 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 4812f55011..d8adf834f3 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 8b5d4c4e58..030f36d65b 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." |