Add to the configuration file for instrumentation tests

components that use Room
mozilla-mobile · Jun 1, 2020 · b7c015a · b7c015a
1 parent 726daec
commit b7c015a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/automation/taskcluster/androidTest/ui-test.sh b/automation/taskcluster/androidTest/ui-test.sh
@@ -84,8 +84,15 @@ samples=${component//samples-}
 if [[ "${component}" != samples-* ]]
 then
     # Case 1: tests for any component (but NOT samples, NOT real UI tests)
-    APK_APP="./samples/${component}/build/outputs/apk/geckoNightly/debug/samples-${component}-geckoNightly-debug.apk"
-    APK_TEST="./components/${component}/engine-gecko-nightly/build/outputs/apk/androidTest/debug/browser-engine-gecko-nightly-debug-androidTest.apk"
+    APK_APP="./samples/browser/build/outputs/apk/geckoNightly/debug/samples-browser-geckoNightly-debug.apk"
+    if [[ "${component}" == *"-"* ]]
+    then
+      regex='([a-z]*)-(.*)'
+      [[ "$component" =~ $regex ]]
+      APK_TEST="./components/${BASH_REMATCH[1]}/${BASH_REMATCH[2]}/build/outputs/apk/androidTest/debug/${component}-debug-androidTest.apk"
+      else
+        APK_TEST="./components/${component}/engine-gecko-nightly/build/outputs/apk/androidTest/debug/browser-engine-gecko-nightly-debug-androidTest.apk"
+    fi
 elif [[ "${component}" == "samples-browser" ]]
 then
     # Case 2: tests for browser sample (geckoNightly sample only)

diff --git a/taskcluster/ci/test/kind.yml b/taskcluster/ci/test/kind.yml
@@ -70,3 +70,24 @@ jobs:
                 - ['automation/taskcluster/androidTest/ui-test.sh', 'samples-glean', 'arm', '1']
         treeherder:
             symbol: 'ui-samples-glean'
+    android-feature-pwa:
+        description: 'Run unit tests on device for feature pwa'
+        run:
+            post-gradlew:
+                - ['automation/taskcluster/androidTest/ui-test.sh', 'feature-pwa', 'arm', '1']
+        treeherder:
+            symbol: 'unit-feature-pwa'
+    android-feature-sitepermissions:
+        description: 'Run unit tests on device for feature site permissions'
+        run:
+            post-gradlew:
+                - ['automation/taskcluster/androidTest/ui-test.sh', 'feature-sitepermissions', 'arm', '1']
+        treeherder:
+            symbol: 'unit-sitepermissions'
+    android-feature-top-sites:
+        description: 'Run unit tests on device for feature top sites'
+        run:
+            post-gradlew:
+                - ['automation/taskcluster/androidTest/ui-test.sh', 'feature-top-sites', 'arm', '1']
+        treeherder:
+            symbol: 'unit-feature-top-sites'