Increase connected check timeout for Firestore to 30m (firebase#2889)

Author: schmidt-sebastian

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestLabExtension.java

@@ -16,12 +16,14 @@
 
 import java.util.Collections;
 import java.util.Set;
+import javax.annotation.Nullable;
 import javax.inject.Inject;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.SetProperty;
 
 public class FirebaseTestLabExtension {
  private final SetProperty<String> devices;
+ private String timeout;
  private boolean enabled;
 
  @Inject
@@ -41,10 +43,19 @@ public void device(String device) {
  devices.add(device);
  }
 
+ public void timeout(String timeout) {
+ this.timeout = timeout;
+ }
+
  Set<String> getDevices() {
  if (devices.get().isEmpty()) {
  return Collections.singleton("model=Pixel2,version=27,locale=en,orientation=portrait");
  }
  return devices.get();
  }
+
+ @Nullable
+ public String getTimeout() {
+ return timeout;
+ }
 }

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java

@@ -89,6 +89,9 @@ public void uploadApks(String variantName, File testApk, File testedApk) {
  .flatMap(device -> ImmutableList.of("--device", device).stream())
  .collect(Collectors.toList()));
 
+ Optional.ofNullable(extension.getTimeout())
+ .ifPresent(timeout -> args.add("--timeout", timeout));
+
  Optional.ofNullable(System.getenv("FTL_RESULTS_BUCKET"))
  .map(Environment::expand)
  .ifPresent(bucket -> args.add("--results-bucket", bucket));

firebase-firestore/firebase-firestore.gradle

@@ -18,8 +18,11 @@ plugins {
 }
 
 firebaseLibrary {
- testLab.enabled = true
  publishSources = true
+ testLab {
+ enabled = true
+ timeout = '30m'
+ }
 }
 
 protobuf {