changes bucket to use env var, minor script changes

Signed-off-by: Chiang <[email protected]>

scripts/build/Platform/Windows/build_config.json

@@ -22,7 +22,7 @@
     "COMMAND": "upload_metrics_windows.cmd",
     "PARAMETERS": {
       "CSV_DIRECTORY": "build\\windows\\Testing\\csv",
-      "BUCKET": "s3://o3de-metrics/csv/"
+      "BUCKET":  "!O3DE_METRICS_S3_BUCKET!"
     }
   },
   "test_cpu_profile_internal_metrics": {

scripts/build/Platform/Windows/upload_metrics_windows.cmd

@@ -7,7 +7,7 @@ REM SPDX-License-Identifier: Apache-2.0 OR MIT
 REM
 REM
 
-ECHO [ci_build] aws s3 cp --recursive %CSV_DIRECTORY% s3://o3de-metrics/csv/ --acl bucket-owner-full-control
+ECHO [ci_build] aws s3 cp --recursive %CSV_DIRECTORY% %BUCKET% --acl bucket-owner-full-control
 
 aws s3 cp --recursive %CSV_DIRECTORY% %BUCKET% --acl bucket-owner-full-control
 

scripts/metrics/ctest_metrics_xml_to_csv.py

@@ -23,7 +23,7 @@ TESTING_DIR = 'Testing'
 def _get_default_csv_filename():
     # Format default file name based off of date
     now = datetime.datetime.now()
-    return f"{now.year}_{now.month:02d}_{now.day:02d}.csv"
+    return f"{now.year}_{now.month:02d}_{now.day:02d}_{now.hour:02d}_{now.minute:02d}.csv"
 
 
 # Setup logging.
@@ -79,7 +79,7 @@ def parse_args():
     )
     parser.add_argument(
         "--csv-file", action="store", default=_get_default_csv_filename(),
-        help=f"The directory and file name for the csv to be saved (defaults to YYYY_MM_DD)."
+        help=f"The directory and file name for the csv to be saved (defaults to YYYY_MM_DD_HH_mm)."
     )
     parser.add_argument(
         "-o", "--output-directory", action="store", default="",
@@ -128,7 +128,7 @@ def _get_test_xml_path(build_path, xml_file):
 
 
 def parse_ctest_xml_to_csv(full_xml_path, writer):
-    # type (str, dict, DictWriter) -> None
+    # type (str, DictWriter) -> None
     """
     Parses the CTest xml file and writes the data to a csv file. Each test result will be written as a separate line.
     The structure of the CTest xml is assumed to be as followed:

scripts/metrics/tests/test_metrics_xml_to_csv.py

@@ -21,11 +21,13 @@ class TestMetricsXMLtoCSV(unittest.TestCase):
         mock_date.month = 1
         mock_date.day = 2
         mock_date.year = "xxxx"
+        mock_date.hour = 3
+        mock_date.minute = 4
         mock_datetime.now.return_value = mock_date
 
         under_test = ctest_metrics_xml_to_csv._get_default_csv_filename()
 
-        assert under_test == "xxxx_01_02.csv"
+        assert under_test == "xxxx_01_02_03_04.csv"
 
     @mock.patch("ctest_metrics_xml_to_csv.datetime.datetime")
     def test_GetDefaultCSVFilename_DoubleDigit_NoZeroes(self, mock_datetime):
@@ -33,11 +35,13 @@ class TestMetricsXMLtoCSV(unittest.TestCase):
         mock_date.month = 11
         mock_date.day = 12
         mock_date.year = "xxxx"
+        mock_date.hour = 13
+        mock_date.minute = 14
         mock_datetime.now.return_value = mock_date
 
         under_test = ctest_metrics_xml_to_csv._get_default_csv_filename()
 
-        assert under_test == "xxxx_11_12.csv"
+        assert under_test == "xxxx_11_12_13_14.csv"
 
     @mock.patch('os.path.exists', mock.MagicMock(side_effect=[True, True]))
     @mock.patch('builtins.open')