Merge branch 'development' into test_artifact_collection

Signed-off-by: evanchia <evanchia@amazon.com>

Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py

@@ -277,7 +277,7 @@ class AbstractResourceLocator(object):
     def get_shader_compiler_path(self):
         """
         Return path to shader compiler executable
-        ex. engine_root/dev/windows_vs2019/bin/profile/CrySCompileServer
+        ex. engine_root/dev/windows/bin/profile/CrySCompileServer
         :return: path to CrySCompileServer executable
         """
         return os.path.join(self.build_directory(), 'CrySCompileServer')
@@ -313,7 +313,7 @@ class AbstractResourceLocator(object):
     def shader_compiler_config_file(self):
         """
         Return path to the Shader Compiler config file
-        ex. engine_root/dev/windows_vs2019/bin/profile/config.ini
+        ex. engine_root/dev/windows/bin/profile/config.ini
         :return: path to the Shader Compiler config file
         """
         return os.path.join(self.build_directory(), 'config.ini')
@@ -321,7 +321,7 @@ class AbstractResourceLocator(object):
     def shader_cache(self):
         """
         Return path to the shader cache for the current build
-        ex. engine_root/dev/windows_vs2019/bin/profile/Cache
+        ex. engine_root/dev/windows/bin/profile/Cache
         :return: path to the shader cache for the current build
         """
         return os.path.join(self.build_directory(), 'Cache')

Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py

@@ -119,7 +119,7 @@ class AbstractWorkspaceManager:
 
     def clear_bin(self):
         """
-        Clears the relative Bin folder (i.e. engine_root/dev/windows_vs2019/bin/profile/)
+        Clears the relative Bin folder (i.e. engine_root/dev/windows/bin/profile/)
         :return: None
         """
         if os.path.exists(self.paths.build_directory()):

Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py

@@ -91,7 +91,7 @@ class Launcher(object):
                         open(os.path.join(self.workspace.paths.project_log(), artifact), 'w').close() # clear it
                         log.info(f"Clearing pre-existing artifact {artifact} from calling Launcher.setup()")
                 except PermissionError:
-                    log.warn(f'Unable to remove artifact: {artifact}, skipping.')
+                    log.warning(f'Unable to remove artifact: {artifact}, skipping.')
                     pass
 
         # In case this is the first run, we will create default logs to prevent the logmonitor from not finding the file

Tools/LyTestTools/ly_test_tools/o3de/editor_test.py

@@ -304,6 +304,8 @@ class EditorTestSuite():
     use_null_renderer = True
     # Maximum time for a single editor to stay open on a shared test
     timeout_editor_shared_test = 300
+    # Flag to determine whether to use new prefab system or use deprecated slice system for this test suite
+    enable_prefab_system = True
 
     # Function to calculate number of editors to run in parallel, this can be overriden by the user
     @staticmethod
@@ -742,7 +744,11 @@ class EditorTestSuite():
             test_cmdline_args += ["--attach-debugger"]
         if test_spec.wait_for_debugger:
             test_cmdline_args += ["--wait-for-debugger"]
-            
+        if self.enable_prefab_system:
+            test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=true"]
+        else:
+            test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=false"]
+
         # Cycle any old crash report in case it wasn't cycled properly
         editor_utils.cycle_crash_report(run_id, workspace)
 
@@ -805,7 +811,11 @@ class EditorTestSuite():
             test_cmdline_args += ["--attach-debugger"]
         if any([t.wait_for_debugger for t in test_spec_list]):
             test_cmdline_args += ["--wait-for-debugger"]
-            
+        if self.enable_prefab_system:
+            test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=true"]
+        else:
+            test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=false"]
+
         # Cycle any old crash report in case it wasn't cycled properly
         editor_utils.cycle_crash_report(run_id, workspace)