abandoned: feat: added max-test-shards and client-details to additional-app-test-apks

test_runner/src/main/kotlin/ftl/args/CreateAndroidArgs.kt

@@ -32,11 +32,20 @@ fun createAndroidArgs(
     roboScript = gcloud.roboScript?.normalizeFilePath(),
 
     // flank
-    additionalAppTestApks = flank.additionalAppTestApks?.map { (app, test, env) ->
+    additionalAppTestApks = flank.additionalAppTestApks?.map {
+        // if additional-pair did not provide certain values, set as top level ones
+        val mergedClientDetails = mutableMapOf<String, String>().apply {
+            // merge additionalAppTestApk's client-details with top-level client-details
+            putAll(commonArgs.clientDetails ?: emptyMap())
+            putAll(it.clientDetails)
+        }
+
         AppTestPair(
-            app = app?.normalizeFilePath(),
-            test = test.normalizeFilePath(),
-            environmentVariables = env
+            app = it.app?.normalizeFilePath(),
+            test = it.test.normalizeFilePath(),
+            environmentVariables = it.environmentVariables,
+            maxTestShards = if (it.maxTestShards == -1) commonArgs.maxTestShards else it.maxTestShards,
+            clientDetails = mergedClientDetails
         )
     } ?: emptyList(),
     useLegacyJUnitResult = flank::useLegacyJUnitResult.require(),

test_runner/src/main/kotlin/ftl/args/yml/AppTestPair.kt

@@ -1,12 +1,22 @@
 package ftl.args.yml
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter
+import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
+
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class AppTestPair(
     val app: String?,
     val test: String,
     @JsonProperty("environment-variables")
-    val environmentVariables: Map<String, String> = emptyMap()
+    val environmentVariables: Map<String, String> = emptyMap(),
+    @JsonProperty("max-test-shards")
+    val maxTestShards: Int = -1,
+    @JsonProperty("client-details")
+    var clientDetails: Map<String, String> = emptyMap()
 )

test_runner/src/main/kotlin/ftl/gc/GcAndroidTestMatrix.kt

@@ -38,10 +38,15 @@ object GcAndroidTestMatrix {
         obbFiles: Map<String, String>
     ): Testing.Projects.TestMatrices.Create {
         // https://github.com/bootstraponline/studio-google-cloud-testing/blob/203ed2890c27a8078cd1b8f7ae12cf77527f426b/firebase-testing/src/com/google/gct/testing/launcher/CloudTestsLauncher.java#L120
-        val clientInfo = ClientInfo()
-            .setName("Flank")
-            .setClientInfoDetails(args.clientDetails?.toClientInfoDetailList())
-
+        val clientInfo = if (androidTestConfig is AndroidTestConfig.Instrumentation && androidTestConfig.clientDetails.isNotEmpty()) {
+                            ClientInfo()
+                                .setName("Flank")
+                                .setClientInfoDetails(androidTestConfig.clientDetails.toClientInfoDetailList())
+                        } else {
+                            ClientInfo()
+                                .setName("Flank")
+                                .setClientInfoDetails(args.clientDetails?.toClientInfoDetailList())
+                        }
         val matrixGcsPath = join(args.resultsBucket, runGcsPath)
 
         // --auto-google-login

test_runner/src/main/kotlin/ftl/run/model/AndroidTestContext.kt

@@ -13,7 +13,9 @@ data class InstrumentationTestContext(
     val shards: List<Chunk> = emptyList(),
     val ignoredTestCases: IgnoredTestCases = emptyList(),
     val environmentVariables: Map<String, String> = emptyMap(),
-    val testTargetsForShard: ShardChunks = emptyList()
+    val testTargetsForShard: ShardChunks = emptyList(),
+    val maxTestShards: Int = 0,
+    val clientDetails: Map<String, String> = emptyMap()
 ) : AndroidTestContext()
 
 data class RoboTestContext(

test_runner/src/main/kotlin/ftl/run/platform/android/AndroidTestConfig.kt

@@ -15,7 +15,8 @@ sealed class AndroidTestConfig {
         val numUniformShards: Int?,
         val keepTestTargetsEmpty: Boolean,
         val environmentVariables: Map<String, String> = emptyMap(),
-        val testTargetsForShard: ShardChunks
+        val testTargetsForShard: ShardChunks,
+        val clientDetails: Map<String, String> = emptyMap()
     ) : AndroidTestConfig()
 
     data class Robo(

test_runner/src/main/kotlin/ftl/run/platform/android/CreateAndroidTestContext.kt

@@ -38,14 +38,15 @@ private suspend fun List<AndroidTestContext>.setupShards(
     testFilter: TestFilter = TestFilters.fromTestTargets(args.testTargets, args.testTargetsForShard)
 ): List<AndroidTestContext> = coroutineScope {
     map { testContext ->
+        val newArgs = if (testContext is InstrumentationTestContext && testContext.maxTestShards > 0) {
+            args.copy(commonArgs = args.commonArgs.copy(maxTestShards = testContext.maxTestShards))
+        } else args
         async {
             when {
                 testContext !is InstrumentationTestContext -> testContext
-                args.useCustomSharding -> testContext.userShards(args.customSharding)
-                args.useTestTargetsForShard ->
-                    testContext.downloadApks()
-                        .calculateDummyShards(args, testFilter)
-                else -> testContext.downloadApks().calculateShards(args, testFilter)
+                newArgs.useCustomSharding -> testContext.userShards(newArgs.customSharding)
+                newArgs.useTestTargetsForShard -> testContext.downloadApks().calculateDummyShards(newArgs, testFilter)
+                else -> testContext.downloadApks().calculateShards(newArgs, testFilter)
             }
         }
     }.awaitAll().dropEmptyInstrumentationTest()

test_runner/src/main/kotlin/ftl/run/platform/android/ResolveApks.kt

@@ -5,11 +5,7 @@ import ftl.args.AndroidArgs
 import ftl.args.isGameLoop
 import ftl.args.isSanityRobo
 import ftl.run.exception.FlankGeneralError
-import ftl.run.model.AndroidTestContext
-import ftl.run.model.GameLoopContext
-import ftl.run.model.InstrumentationTestContext
-import ftl.run.model.RoboTestContext
-import ftl.run.model.SanityRoboTestContext
+import ftl.run.model.*
 import ftl.util.asFileReference
 
 @VisibleForTesting
@@ -40,6 +36,8 @@ private fun AndroidArgs.additionalApksContexts() = additionalAppTestApks.map {
         app = appApk.asFileReference(),
         test = it.test.asFileReference(),
         environmentVariables = it.environmentVariables,
-        testTargetsForShard = testTargetsForShard
+        testTargetsForShard = testTargetsForShard,
+        maxTestShards = it.maxTestShards,
+        clientDetails = it.clientDetails,
     )
 }.toTypedArray()