From 0f96e7e4cf43f5ce1a8ddb351a291444008c6253 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 29 Apr 2020 20:08:54 -0700 Subject: [PATCH] [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 --- test/runner/lib/core_ci.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/runner/lib/core_ci.py b/test/runner/lib/core_ci.py index 9fa564f3cab..e8425e090a5 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)