Snap for 10897809 from 61c252a530aabde8925231ef4ed04cd1de61a122 to 24Q1-release

Change-Id: I567a2140bdc0939787eab6f5f3fe06f37f404a30

4 files changed, 88 insertions, 31 deletions

diff --git a/tools/catbox-common/res/config/catbox-performance-base.xml b/tools/catbox-common/res/config/catbox-performance-base.xml
index 0907b2b..1b1bec5 100644
--- a/tools/catbox-common/res/config/catbox-performance-base.xml
+++ b/tools/catbox-common/res/config/catbox-performance-base.xml
@@ -14,33 +14,37 @@
      limitations under the License.
 -->
 <configuration description="Automotive Performance Test Base.">
-  <!-- Common Target Preparers -->
-  <include name="catbox-preparer" />
-
-  <!-- Result Reporter -->
-  <result_reporter class="com.android.catbox.result.JsonResultReporter">
-    <option name="dest-dir" value="report-log-files/"/>
-    <option name="test-iteration-separator" value="$"/>
-    <option name="aggregate-similar-tests" value="true"/>
-  </result_reporter>
-
-  <!-- Common Config -->
-  <include name="catbox-common" />
-
-  <!-- Test Tag Suffix -->
-  <option name="test-tag-suffix" value="performance" />
-
-  <!-- Performance Specific Target Preparers -->
-  <target_preparer class="com.android.tradefed.targetprep.PerfettoPreparer" />
-  <target_preparer class="com.android.tradefed.targetprep.TimeWaster" />
-  <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ReportLogCollector">
-    <option name="src-dir" value="/sdcard/report-log-files/"/>
-    <option name="dest-dir" value="report-log-files/"/>
-    <option name="temp-dir" value="temp-report-logs/"/>
-  </target_preparer>
-  <target_preparer class="com.android.catbox.targetpreparer.ChromeMdPassengerLoadPreparer">
-    <option name="disable" value="true"/>
-    <option name="url" value="https://youtu.be/dQw4w9WgXcQ"/>
-  </target_preparer>
+    <!-- Common Target Preparers -->
+    <include name="catbox-preparer"/>
+
+    <!-- Result Reporter -->
+    <result_reporter class="com.android.catbox.result.JsonResultReporter">
+        <option name="dest-dir" value="report-log-files/"/>
+        <option name="test-iteration-separator" value="$"/>
+        <option name="aggregate-similar-tests" value="true"/>
+    </result_reporter>
+
+    <!-- Common Config -->
+    <include name="catbox-common"/>
+
+    <!-- Test Tag Suffix -->
+    <option name="test-tag-suffix" value="performance"/>
+
+    <!-- Performance Specific Target Preparers -->
+    <target_preparer class="com.android.tradefed.targetprep.PerfettoPreparer"/>
+    <target_preparer class="com.android.tradefed.targetprep.TimeWaster"/>
+    <target_preparer
+        class="com.android.compatibility.common.tradefed.targetprep.ReportLogCollector">
+        <option name="src-dir" value="/sdcard/report-log-files/"/>
+        <option name="dest-dir" value="report-log-files/"/>
+        <option name="temp-dir" value="temp-report-logs/"/>
+    </target_preparer>
+    <target_preparer class="com.android.catbox.targetpreparer.ChromeMdPassengerLoadPreparer">
+        <option name="disable" value="true"/>
+        <option name="url" value="https://youtu.be/dQw4w9WgXcQ"/>
+    </target_preparer>
+
+    <!-- Enable perfetto host side metric collector -->
+    <include name="perfetto-puller"/>
 
 </configuration>
diff --git a/tools/catbox-common/res/config/perfetto-puller.xml b/tools/catbox-common/res/config/perfetto-puller.xml
new file mode 100644
index 0000000..a29cf72
--- /dev/null
+++ b/tools/catbox-common/res/config/perfetto-puller.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<configuration description="Pull the files from the device and add it to the test logs.">
+    <!-- Pulls the perfetto files from the device and collects the metrics from the trace files -->
+    <metrics_collector class="com.android.tradefed.device.metric.PerfettoPullerMetricCollector" />
+</configuration>
\ No newline at end of file
diff --git a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-discovery.xml b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
index c7a98c9..7630707 100644
--- a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-discovery.xml
+++ b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
@@ -13,9 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Bluetooth Discovery Test Using Mobly">
+<configuration description="Bluetooth Tests Using Mobly">
   <!-- Plan -->
-  <option name="plan" value="catbox-functional-bluetooth-discovery"/>
+  <!-- TODO(@vitalidim) rename test plan since it's not for bt discovery only -->
+  <option name="plan" value="catbox-functional-bluetooth-tests"/>
 
   <include name="everything" />
 
@@ -59,7 +60,6 @@
 
   <test class="com.android.tradefed.testtype.mobly.MoblyBinaryHostTest">
     <!-- The mobly-par-file-name should match the module name -->
-    <option name="mobly-par-file-name" value="BTDiscoveryTest" />
     <!-- Timeout limit in milliseconds for all test cases of the python binary -->
     <option name="mobly-test-timeout" value="180000" />
     <!-- Testbed config file -->
diff --git a/tools/catbox-tradefed/res/config/catbox-functional-systemui.xml b/tools/catbox-tradefed/res/config/catbox-functional-systemui.xml
new file mode 100644
index 0000000..fcaae21
--- /dev/null
+++ b/tools/catbox-tradefed/res/config/catbox-functional-systemui.xml
@@ -0,0 +1,33 @@
+<!--
+ Copyright (C) 2023 Google Inc.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Complete Automotive Tests - System UI Tests.">
+  <!-- Common Base -->
+  <include name="catbox-common"/>
+
+  <!-- Device Preparers -->
+  <include name="catbox-preparer"/>
+
+  <!-- Plan -->
+  <option name="plan" value="catbox-functional-systemui"/>
+
+  <!-- Test Args -->
+  <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:runner:androidx.test.runner.AndroidJUnitRunner" />
+  <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:package:android.platform.tests" />
+  <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:no-rerun:true" />
+
+  <!-- Tests -->
+  <option name="compatibility:include-filter" value="AndroidAutomotiveHomeTests android.platform.tests.SystemUiTest" />
+</configuration>
\ No newline at end of file