Merge "Move a bit the cts-on-gsi configs"
diff --git a/tools/vts-tradefed/res/config/cts-base-common.xml b/tools/vts-tradefed/res/config/cts-base-common.xml
index 64b20d5..26df669 100644
--- a/tools/vts-tradefed/res/config/cts-base-common.xml
+++ b/tools/vts-tradefed/res/config/cts-base-common.xml
@@ -16,7 +16,6 @@
<configuration description="Base test plan for running CTS test modules with VTS">
<option name="dynamic-sharding" value="true" />
- <option name="disable-strict-sharding" value="true" />
<device_recovery class="com.android.tradefed.device.WaitDeviceRecovery" />
<build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider">
<option name="url-suite-name-override" value="CTS" />
diff --git a/tools/vts-tradefed/res/config/cts-base.xml b/tools/vts-tradefed/res/config/cts-base.xml
index 155481b..6ae6788 100644
--- a/tools/vts-tradefed/res/config/cts-base.xml
+++ b/tools/vts-tradefed/res/config/cts-base.xml
@@ -15,11 +15,14 @@
-->
<configuration description="Base test plan for CTS based tests">
- <include name="cts-base-common" />
+ <!-- include base cts -->
+ <include name="cts" />
- <test class="com.android.compatibility.common.tradefed.testtype.suite.CompatibilityTestSuite">
- <option name="run-suite-tag" value="cts" />
- </test>
+ <!-- Specialization to be able to run CTS inside android-vts.zip -->
+ <option name="compatibility-build-provider:url-suite-name-override" value="CTS" />
+ <option name="dynamic-config-pusher:dynamic-resource-name" value="vts-tradefed" />
+ <option name="compatibility:primary-abi-only" value="true" />
+ <option name="compatibility:config-patterns" value="Cts.*\.config" />
<!-- Explicitly include CTS components listed in CtsConfigLoadingTest.java -->
<option name="compatibility:module-metadata-include-filter" key="component" value="abuse" />
diff --git a/tools/vts-tradefed/res/config/cts-on-gsi.xml b/tools/vts-tradefed/res/config/cts-on-gsi.xml
index 0cfc6aa..2a0b748 100644
--- a/tools/vts-tradefed/res/config/cts-on-gsi.xml
+++ b/tools/vts-tradefed/res/config/cts-on-gsi.xml
@@ -16,6 +16,7 @@
<configuration description="Runs a subset of CTS tests using a general system image (GSI)">
<include name="common-preparers" />
<include name="cts-base" />
+
<include name="cts-on-gsi-exclude" />
<option name="plan" value="cts-on-gsi" />
