Implement sanityRobo

runningcode · Sep 25, 2020 · 4978a4b · 4978a4b
1 parent 7678e81
commit 4978a4b
Show file tree

Hide file tree

Showing 5 changed files with 363 additions and 9 deletions.
diff --git a/buildSrc/src/main/java/com/osacky/flank/gradle/FladlePluginDelegate.kt b/buildSrc/src/main/java/com/osacky/flank/gradle/FladlePluginDelegate.kt
@@ -40,6 +40,8 @@ class FladlePluginDelegate {
       // Must be done afterEvaluate otherwise extension values will not be set.
       project.dependencies.add(FLADLE_CONFIG, "${base.flankCoordinates.get()}:${base.flankVersion.get()}")
 
+      if (project.hasProperty("sanityRobo")) base.sanityRobo.set(true)
+
       // Only use automatic apk path detection for 'com.android.application' projects.
       project.pluginManager.withPlugin("com.android.application") {
         if (!base.debugApk.isPresent || !base.instrumentationApk.isPresent) {

diff --git a/buildSrc/src/main/java/com/osacky/flank/gradle/FlankGradleExtension.kt b/buildSrc/src/main/java/com/osacky/flank/gradle/FlankGradleExtension.kt
@@ -17,6 +17,9 @@ open class FlankGradleExtension @Inject constructor(objects: ObjectFactory) : Fl
   @get:Input
   val flankCoordinates: Property<String> = objects.property(String::class.java).convention("com.github.flank:flank")
 
+  @get:Input
+  val sanityRobo: Property<Boolean> = objects.property<Boolean>().convention(false)
+
   @get:Input
   val flankVersion: Property<String> = objects.property(String::class.java).convention("20.08.3")
   // Project id is automatically discovered by default. Use this to override the project id.

diff --git a/buildSrc/src/main/java/com/osacky/flank/gradle/YamlWriter.kt b/buildSrc/src/main/java/com/osacky/flank/gradle/YamlWriter.kt
@@ -9,22 +9,24 @@ internal class YamlWriter {
       check(base.serviceAccountCredentials.isPresent) { "ServiceAccountCredentials in fladle extension not set. https://github.com/runningcode/fladle#serviceaccountcredentials" }
     }
     check(base.debugApk.isPresent) { "debugApk must be specified" }
-    check(base.instrumentationApk.isPresent xor !base.roboScript.isNullOrBlank()) {
+    check(base.sanityRobo.get() == true || (base.instrumentationApk.isPresent xor !base.roboScript.isNullOrBlank())) {
       """
      Either instrumentationApk file or roboScript file must be specified but not both.
      instrumentationApk=${base.instrumentationApk.orNull}
      roboScript=${base.roboScript}
       """.trimIndent()
     }
 
+    val shouldPrintTestAndRobo = base.sanityRobo.get().not()
     val deviceString = createDeviceString(config.devices)
-    val additionalProperties = writeAdditionalProperties(config)
-    val flankProperties = writeFlankProperties(config)
+    val additionalProperties = writeAdditionalProperties(config, shouldPrintTestAndRobo)
+    val flankProperties = writeFlankProperties(config, shouldPrintTestAndRobo)
 
     return buildString {
       appendln("gcloud:")
       appendln("  app: ${base.debugApk.get()}")
-      if (base.instrumentationApk.isPresent) {
+      // We don't want to print instrumentation apks if sanityRobo == true
+      if (shouldPrintTestAndRobo && base.instrumentationApk.isPresent) {
         appendln("  test: ${base.instrumentationApk.get()}")
       }
       appendln(deviceString)
@@ -33,7 +35,7 @@ internal class YamlWriter {
     }
   }
 
-  internal fun writeFlankProperties(config: FladleConfig): String = buildString {
+  internal fun writeFlankProperties(config: FladleConfig, printApk: Boolean = true): String = buildString {
     val testShards = config.testShards
     val shardTime = config.shardTime
     val repeatTests = config.repeatTests
@@ -73,7 +75,7 @@ internal class YamlWriter {
     }
     val additionalTestApks = config.additionalTestApks.getOrElse(emptyList())
 
-    if (additionalTestApks.isNotEmpty()) {
+    if (printApk && additionalTestApks.isNotEmpty()) {
       appendln("  additional-app-test-apks:")
       additionalTestApks.forEach {
         appendln("    $it")
@@ -101,7 +103,7 @@ internal class YamlWriter {
     appendln("  output-style: ${config.outputStyle.get()}")
   }
 
-  internal fun writeAdditionalProperties(config: FladleConfig): String = buildString {
+  internal fun writeAdditionalProperties(config: FladleConfig, printRobo: Boolean = true): String = buildString {
     appendln("  use-orchestrator: ${config.useOrchestrator}")
     appendln("  auto-google-login: ${config.autoGoogleLogin}")
     appendln("  record-video: ${config.recordVideo}")
@@ -166,11 +168,11 @@ internal class YamlWriter {
       appendln("  network-profile: $it")
     }
 
-    config.roboScript?.let {
+    if (printRobo) config.roboScript?.let {
       appendln("  robo-script: $it")
     }
 
-    if (config.roboDirectives.isNotEmpty()) {
+    if (printRobo && config.roboDirectives.isNotEmpty()) {
       appendln("  robo-directives:")
       config.roboDirectives.forEach {
         val value = it.getOrElse(2) { "" }.let { stringValue -> if (stringValue.isBlank()) "\"\"" else stringValue }