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

Fix for PathLib unlink wrong version parameter. (#3020)

Browse Source 
* Fix for PathLib unlink wrong version parameter.

* Fix dst target for TIAF.

* Remove TIAF historic data arhciving on s3 buckets

* Change permissions for TIAF bucket upload

Signed-off-by: John <jonawals@amazon.com>
This commit is contained in:
jonawals
2021-08-11 02:43:44 +01:00
committed by GitHub
parent 4cee263033
commit a7a0e8d2ef
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build/Platform/Windows/build_config.json
+1 -1
View File
@@ -89,7 +89,7 @@
"CONFIGURATION": "profile",
"SCRIPT_PATH": "scripts/build/TestImpactAnalysis/tiaf_driver.py",
"SCRIPT_PARAMETERS":
"--config=\"!OUTPUT_DIRECTORY!/bin/TestImpactFramework/profile/Persistent/tiaf.json\" --src-branch=!BRANCH_NAME! --dst-branch=!BRANCH_NAME! --commit=!CHANGE_ID! --s3-bucket=!TEST_IMPACT_S3_BUCKET! --mars-index-prefix=jonawals --suite=main --test-failure-policy=continue"
"--config=\"!OUTPUT_DIRECTORY!/bin/TestImpactFramework/profile/Persistent/tiaf.json\" --src-branch=!BRANCH_NAME! --dst-branch=!CHANGE_TARGET! --commit=!CHANGE_ID! --s3-bucket=!TEST_IMPACT_S3_BUCKET! --mars-index-prefix=jonawals --suite=main --test-failure-policy=continue"
}
},
"debug_vs2019": {
scripts/build/TestImpactAnalysis/git_utils.py
+3 -1
View File
@@ -32,7 +32,9 @@ class Repo:
try:
# Remove the existing file (if any) and create the parent directory
output_path.unlink(missing_ok=True)
# output_path.unlink(missing_ok=True) # missing_ok is only available in Python 3.8+
if output_path.is_file():
output_path.unlink()
output_path.parent.mkdir(exist_ok=True)
except EnvironmentError as e:
raise RuntimeError(f"Could not create path for output file '{output_path}'")
scripts/build/TestImpactAnalysis/tiaf_persistent_storage_s3.py
+3 -6
View File
@@ -48,14 +48,11 @@ class PersistentStorageS3(PersistentStorage):
for object in self._bucket.objects.filter(Prefix=self._historic_data_key):
logger.info(f"Historic data found for branch '{branch}'.")
# Archive the existing object with the name of the existing last commit hash
archive_key = f"{self._dir}/archive/{self._last_commit_hash}.{object_extension}"
logger.info(f"Archiving existing historic data to {archive_key}...")
self._bucket.copy({"Bucket": self._bucket.name, "Key": self._historic_data_key}, archive_key)
# Decode the historic data object into raw bytes
logger.info(f"Attempting to decode historic data object...")
response = object.get()
file_stream = response['Body']
logger.info(f"Decoding complete.")
# Decompress and unpack the zipped historic data JSON
historic_data_json = zlib.decompress(file_stream.read()).decode('UTF-8')
@@ -79,7 +76,7 @@ class PersistentStorageS3(PersistentStorage):
try:
data = BytesIO(zlib.compress(bytes(historic_data_json, "UTF-8")))
logger.info(f"Uploading historic data to location '{self._historic_data_key}'...")
self._bucket.upload_fileobj(data, self._historic_data_key)
self._bucket.upload_fileobj(data, self._historic_data_key, ExtraArgs={'ACL': 'bucket-owner-full-control'})
logger.info("Upload complete.")
except botocore.exceptions.BotoCoreError as e:
logger.error(f"There was a problem with the s3 bucket: {e}")