Skip to content

Commit ec7db4c

Browse files
committed
Add a way to pass in orchestrator option when calling FTL
Test: usage in androidx.dev
1 parent 09b9ac4 commit ec7db4c

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ internal class TestMatrixStore(
302302
gcsPath = testApk.gcsPath.path
303303
),
304304
shardingOption = sharding,
305-
testTargets = testTargets
305+
testTargets = testTargets,
306+
orchestratorOption = deviceSetup?.orchestratorOption
306307
),
307308
testSetup = testSetup
308309
)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ internal class TestRun(
8787
"additionalApks" to deviceSetup?.additionalApks?.map {
8888
it.gcsPath.path
8989
}, // The order we install additional apks is important, so we do not sort here.
90+
"orchestratorOption" to deviceSetup?.orchestratorOption,
9091
"directoriesToPull" to deviceSetup?.directoriesToPull?.sorted()
9192
)
9293
)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.androidx.ci.testRunner.vo
22

3+
import dev.androidx.ci.generated.ftl.AndroidInstrumentationTest.OrchestratorOption
34
import dev.androidx.ci.generated.ftl.Apk
45
import dev.androidx.ci.generated.ftl.EnvironmentVariable
56
import dev.androidx.ci.generated.ftl.FileReference
@@ -25,7 +26,9 @@ data class DeviceSetup(
2526
/**
2627
* List of instrumentation arguments to be passed into the runner.
2728
*/
28-
val instrumentationArguments: List<InstrumentationArgument>? = null
29+
val instrumentationArguments: List<InstrumentationArgument>? = null,
30+
31+
var orchestratorOption: OrchestratorOption = OrchestratorOption.DO_NOT_USE_ORCHESTRATOR
2932
) {
3033
internal fun toTestSetup(): TestSetup {
3134
return TestSetup(

0 commit comments

Comments
 (0)