diff options
| author | Matt Clay <matt@mystile.com> | 2020-04-29 20:08:54 -0700 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2020-07-07 15:19:08 -0700 |
| commit | 0f96e7e4cf43f5ce1a8ddb351a291444008c6253 (patch) | |
| tree | 0a48db6eba59ab086ebe10b7dd12d868246555a9 | |
| parent | 9fa105f18387e15a20ee4db5a7dd6afc1207279c (diff) | |
| download | ansible-0f96e7e4cf43f5ce1a8ddb351a291444008c6253.tar.gz | |
[stable-2.8] Default ansible-test provisioning to us-east-1.
Previously windows instances on Shippable would be automatically directed to us-east-2.
(cherry picked from commit 1cf26896c50379c671e120985c4f1194f44d0205)
Co-authored-by: Matt Clay <matt@mystile.com>
| -rw-r--r-- | test/runner/lib/core_ci.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/test/runner/lib/core_ci.py b/test/runner/lib/core_ci.py index 9fa564f3ca..e8425e090a 100644 --- a/test/runner/lib/core_ci.py +++ b/test/runner/lib/core_ci.py @@ -108,14 +108,7 @@ class AnsibleCoreCI(object): region = args.remote_aws_region # use a dedicated CI key when overriding the region selection 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 == 'windows': - region = 'us-east-2' - else: - region = 'us-east-1' else: - # send all non-Shippable jobs to us-east-1 to reduce api key maintenance region = 'us-east-1' self.path = "%s-%s" % (self.path, region) |