append AWS region to test instance file (ansible#45877)

(cherry picked from commit 582a4df)

test/runner/lib/core_ci.py

@@ -95,6 +95,8 @@ def __init__(self, args, platform, version, stage='prod', persist=True, load=Tru
                     self.provider = candidate
                     break
 
+        self.path = os.path.expanduser('~/.ansible/test/instances/%s-%s-%s' % (self.name, self.provider, self.stage))
+
         if self.provider in ('aws', 'azure'):
             if self.provider != 'aws':
                 self.resource = self.provider
@@ -114,6 +116,7 @@ def __init__(self, args, platform, version, stage='prod', persist=True, load=Tru
                 # 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)
             self.endpoints = AWS_ENDPOINTS[region],
             self.ssh_key = SshKey(args)
 
@@ -130,8 +133,6 @@ def __init__(self, args, platform, version, stage='prod', persist=True, load=Tru
         else:
             raise ApplicationError('Unsupported platform: %s' % platform)
 
-        self.path = os.path.expanduser('~/.ansible/test/instances/%s-%s-%s' % (self.name, self.provider, self.stage))
-
         if persist and load and self._load():
             try:
                 display.info('Checking existing %s/%s instance %s.' % (self.platform, self.version, self.instance_id),