UNDO BEFORE MERGE - Test to see if we can get this test to pass

Author: snf2ye

build.gradle

@@ -479,12 +479,12 @@ tasks.register('testIntegration', Test) {
         events = ["passed", "failed", "skipped", "started", "standard_out"]
     }
 
-    retry {
-        if (isCiServer) {
-            maxRetries = 3
-            maxFailures = 15
-        }
-    }
+//    retry {
+//        if (isCiServer) {
+//            maxRetries = 3
+//            maxFailures = 15
+//        }
+//    }
     maxParallelForks = 8
     outputs.upToDateWhen { false }
     systemProperty 'junit.jupiter.execution.parallel.enabled', 'true'

src/main/java/bio/terra/common/AclUtils.java

@@ -13,8 +13,8 @@
 public class AclUtils {
   private static final Logger logger = LoggerFactory.getLogger(AclUtils.class);
 
-  private static final int RETRIES = 15;
-  private static final int MAX_WAIT_SECONDS = 30;
+  private static final int RETRIES = 30;
+  private static final int MAX_WAIT_SECONDS = 60;
   private static final int INITIAL_WAIT_SECONDS = 2;
   private static final Random RANDOM = new Random();