Add CtsNetTestCasesLatestSdk to mainline-presubmit
This is the pilot run for mainline testing in Test Mapping Suite.
For supporting mainline testing in Test Mapping Suite, developers can
run tests by configuring the TEST_MAPPING file, the 3 simple steps are:
- Add tests to be part of general-tests suite if the test does not
depend on a device specific features.
- Update test configureation for TradeFed to run mainline testing.
- Update TEST_MAPPING file with test-group as "mainline-presubmit"
It's only for postsubmit now, and will be moved to actual presubmit
once the whole mechanism is stable.
For more details about the usage, please refer to go/test-mapping-mainline-user-guide
Bug: 160753366
Test: forrest.
Change-Id: I8704cc5626a3e049eb3c27adb86e9c1a4d828273
Merged-In: I8704cc5626a3e049eb3c27adb86e9c1a4d828273
diff --git a/tests/tests/net/Android.bp b/tests/tests/net/Android.bp
index 112799b..7eaf133 100644
--- a/tests/tests/net/Android.bp
+++ b/tests/tests/net/Android.bp
@@ -83,7 +83,7 @@
min_sdk_version: "29",
target_sdk_version: "30",
test_suites: [
- "device-tests",
+ "general-tests",
"mts",
],
test_config_template: "AndroidTestTemplate.xml",
diff --git a/tests/tests/net/AndroidTestTemplate.xml b/tests/tests/net/AndroidTestTemplate.xml
index 1f75da1..4e937512 100644
--- a/tests/tests/net/AndroidTestTemplate.xml
+++ b/tests/tests/net/AndroidTestTemplate.xml
@@ -19,6 +19,8 @@
<option name="config-descriptor:metadata" key="parameter" value="instant_app" />
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+ <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk" />
<option name="not-shardable" value="true" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
diff --git a/tests/tests/net/TEST_MAPPING b/tests/tests/net/TEST_MAPPING
index e2a9c75..3162e22 100644
--- a/tests/tests/net/TEST_MAPPING
+++ b/tests/tests/net/TEST_MAPPING
@@ -9,5 +9,15 @@
}
]
}
+ ],
+ "mainline-presubmit": [
+ {
+ "name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk]",
+ "options": [
+ {
+ "exclude-annotation": "com.android.testutils.SkipPresubmit"
+ }
+ ]
+ }
]
}
