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

Tiaf bucket top level fix (#3085)

Browse Source 
* Revert to regular run when invalid commits used.

* Cirrect s3 logging of last commit hash storage

* Add s3 top level url and build number script params.

* Use existing REPOSITORY_NAME env var.

Signed-off-by: John <jonawals@amazon.com>
This commit is contained in:
jonawals
2021-08-12 20:48:23 +01:00
committed by GitHub
parent 8c21c85972
commit ff659fbbb6
7 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build/TestImpactAnalysis/mars_utils.py
+9 -5
View File
@@ -14,6 +14,7 @@ from tiaf_logger import get_logger
logger = get_logger(__file__)
MARS_JOB_KEY = "job"
BUILD_NUMBER_KEY = "build_number"
SRC_COMMIT_KEY = "src_commit"
DST_COMMIT_KEY = "dst_commit"
COMMIT_DISTANCE_KEY = "commit_distance"
@@ -175,12 +176,14 @@ def get_duration_in_seconds(duration_in_milliseconds: int):
return duration_in_milliseconds * 0.001
def generate_mars_job(tiaf_result, driver_args):
def generate_mars_job(tiaf_result, driver_args, build_number: int):
"""
Generates a MARS job document using the job meta-data used to drive the TIAF sequence.
@param tiaf_result: The result object generated by the TIAF script.
@param driver_args: The arguments specified to the driver script.
@param tiaf_result: The result object generated by the TIAF script.
@param driver_args: The arguments specified to the driver script.
@param driver_args: The arguments specified to the driver script.
@param build_number: The build number this job corresponds to.
@return: The MARS job document with the job meta-data.
"""
@@ -203,6 +206,7 @@ def generate_mars_job(tiaf_result, driver_args):
]}
mars_job[DRIVER_ARGS_KEY] = driver_args
mars_job[BUILD_NUMBER_KEY] = build_number
return mars_job
def generate_test_run_list(test_runs):
@@ -418,7 +422,7 @@ def generate_mars_test_targets(sequence_report: dict, mars_job: dict, t0_timesta
return mars_test_targets
def transmit_report_to_mars(mars_index_prefix: str, tiaf_result: dict, driver_args: list):
def transmit_report_to_mars(mars_index_prefix: str, tiaf_result: dict, driver_args: list, build_number: int):
"""
Transforms the TIAF result into the appropriate MARS documents and transmits them to MARS.
@@ -434,7 +438,7 @@ def transmit_report_to_mars(mars_index_prefix: str, tiaf_result: dict, driver_ar
t0_timestamp = datetime.datetime.now().timestamp()
# Generate and transmit the MARS job document
mars_job = generate_mars_job(tiaf_result, driver_args)
mars_job = generate_mars_job(tiaf_result, driver_args, build_number)
filebeat.send_event(mars_job, f"{mars_index_prefix}.tiaf.job")
if tiaf_result[REPORT_KEY]: