Adding parameters for specifying testTargets and num of flakyAttempts in preparition for ftl retries (#69)

Author: rnakade

AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/FirebaseTestLabController.kt

@@ -110,6 +110,8 @@ internal class FirebaseTestLabController(
         devicePicker: DevicePicker? = null,
         pullScreenshots: Boolean = false,
         cachedTestMatrixFilter: CachedTestMatrixFilter,
+        testTargets: List<String>? = null,
+        flakyTestAttempts: Int? = 2
     ): List<TestMatrix> {
         val devices = (devicePicker ?: defaultDevicePicker).pickDevices()
         logger.info {
@@ -125,7 +127,9 @@ internal class FirebaseTestLabController(
                 sharding = sharding,
                 deviceSetup = deviceSetup,
                 pullScreenshots = pullScreenshots,
-                cachedTestMatrixFilter = cachedTestMatrixFilter
+                cachedTestMatrixFilter = cachedTestMatrixFilter,
+                testTargets = testTargets,
+                flakyTestAttempts = flakyTestAttempts
             )
         }
     }

AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestMatrixStore.kt

@@ -69,6 +69,8 @@ internal class TestMatrixStore(
         deviceSetup: DeviceSetup?,
         pullScreenshots: Boolean = false,
         cachedTestMatrixFilter: CachedTestMatrixFilter = { true },
+        testTargets: List<String>? = null,
+        flakyTestAttempts: Int? = 2
     ): TestMatrix {
 
         val testRunId = TestRun.createId(
@@ -114,7 +116,9 @@ internal class TestMatrixStore(
                 deviceSetup = deviceSetup,
                 appApk = appApk,
                 testApk = testApk,
-                pullScreenshots = pullScreenshots
+                pullScreenshots = pullScreenshots,
+                testTargets = testTargets,
+                flakyTestAttempts = flakyTestAttempts
             )
         )
         logger.info {
@@ -177,7 +181,9 @@ internal class TestMatrixStore(
         deviceSetup: DeviceSetup?,
         appApk: UploadedApk,
         testApk: UploadedApk,
-        pullScreenshots: Boolean = false
+        pullScreenshots: Boolean = false,
+        testTargets: List<String>? = null,
+        flakyTestAttempts: Int? = 2
     ): TestMatrix {
         val packageName = firebaseTestLabApi.getApkDetails(
             FileReference(
@@ -206,7 +212,7 @@ internal class TestMatrixStore(
         }
         return TestMatrix(
             projectId = firebaseProjectId,
-            flakyTestAttempts = 2,
+            flakyTestAttempts = flakyTestAttempts,
             testSpecification = TestSpecification(
                 testTimeout = "2700s", // Limit for physical devices.
                 disableVideoRecording = false,
@@ -218,7 +224,8 @@ internal class TestMatrixStore(
                     testApk = FileReference(
                         gcsPath = testApk.gcsPath.path
                     ),
-                    shardingOption = sharding
+                    shardingOption = sharding,
+                    testTargets = testTargets
                 ),
                 testSetup = testSetup
             ),

AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestRunnerService.kt

@@ -80,6 +80,8 @@ interface TestRunnerService {
         devicePicker: (TestEnvironmentCatalog) -> List<AndroidDevice>,
         pullScreenshots: Boolean = false,
         cachedTestMatrixFilter: CachedTestMatrixFilter = { true },
+        testTargets: List<String>? = null,
+        flakyTestAttempts: Int? = 2
     ): ScheduleTestsResponse
 
     /**

AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestRunnerServiceImpl.kt

@@ -100,6 +100,8 @@ internal class TestRunnerServiceImpl internal constructor(
         devicePicker: (TestEnvironmentCatalog) -> List<AndroidDevice>,
         pullScreenshots: Boolean,
         cachedTestMatrixFilter: CachedTestMatrixFilter,
+        testTargets: List<String>?,
+        flakyTestAttempts: Int?
     ): TestRunnerService.ScheduleTestsResponse {
         val testMatrices = testLabController.submitTests(
             appApk = appApk ?: apkStore.getPlaceholderApk(),
@@ -109,7 +111,9 @@ internal class TestRunnerServiceImpl internal constructor(
             deviceSetup = deviceSetup,
             devicePicker = devicePicker,
             pullScreenshots = pullScreenshots,
-            cachedTestMatrixFilter = cachedTestMatrixFilter
+            cachedTestMatrixFilter = cachedTestMatrixFilter,
+            testTargets = testTargets,
+            flakyTestAttempts = flakyTestAttempts
         )
         return TestRunnerService.ScheduleTestsResponse.create(
             testMatrices