birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AWSI Gems Automation Update Jenkins configuration (Windows Only) (#923)

Browse Source 
AWS Automation test fixes to run on AR.

* Enable AWS automation tests

* Testing by making test part of main suite

* Fix tests target path

* Adding __init__.py for CLI to work

* Revert "Merge pull request #868 from aws-lumberyard-dev/LYN-3974"

This reverts commit 7c2051ae54, reversing
changes made to d8bd6ef407.

* Using absolute path in resource mappings

* Rexporting client auth automation tests level

* Adding null renderer param to AWS automation tests launchers

* Adding rhi null flag to run null renderer

* Remove extra hyphen from rhi param

* Updating rhi param

* Adding rhi param to launcher

* Fix rhi param and reexport client auth levels

* Disable AWS automation tests and remove client auth levels'
This commit is contained in:
amzn-hdoke
2021-05-25 11:27:11 -07:00
committed by GitHub
parent 35f09b0c3a
commit a1514eb0b5
8 changed files with 69 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Gem/PythonTests/AWS/Windows/resource_mappings/resource_mappings.py
+10 -4
View File
@@ -10,8 +10,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
"""
import os
from os.path import abspath
import pytest
import json
import logging
logger = logging.getLogger(__name__)
AWS_RESOURCE_MAPPINGS_KEY = 'AWSResourceMappings'
AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY = 'AccountId'
@@ -57,9 +61,9 @@ class ResourceMappings:
stacks = response.get('Stacks', [])
assert len(stacks) == 1, f'{stack_name} is invalid.'
self.__write_resource_mappings(stacks[0].get('Outputs', []))
self._write_resource_mappings(stacks[0].get('Outputs', []))
def __write_resource_mappings(self, outputs, append_feature_name = True) -> None:
def _write_resource_mappings(self, outputs, append_feature_name = True) -> None:
with open(self._resource_mapping_file_path) as file_content:
resource_mappings = json.load(file_content)
@@ -129,8 +133,10 @@ def resource_mappings(
:return: ResourceMappings class object.
"""
path = f'{workspace.paths.engine_root()}\\{project}\\Config\\{resource_mappings_filename}'
resource_mappings_obj = ResourceMappings(path, aws_utils.assume_session().region_name, feature_name,
path = f'{workspace.paths.engine_root()}/{project}/Config/{resource_mappings_filename}'
logger.info(f'Resource mapping path : {path}')
logger.info(f'Resource mapping resolved path : {abspath(path)}')
resource_mappings_obj = ResourceMappings(abspath(path), aws_utils.assume_session().region_name, feature_name,
aws_utils.assume_account_id(), workspace,
aws_utils.client('cloudformation'))