From 34c2c7a0fa4a44cba45bb9c1c3fd4ffeec5c4023 Mon Sep 17 00:00:00 2001
From: averikitsch <akitsch@google.com>
Date: Fri, 4 Mar 2022 09:17:57 -0800
Subject: [PATCH 1/3] chore: update job tests with retries

---
 .../com/example/JobsIntegrationTests.java     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/run/jobs/src/test/java/com/example/JobsIntegrationTests.java b/run/jobs/src/test/java/com/example/JobsIntegrationTests.java
index 8dbcdd3eea1..a8c4e340792 100644
--- a/run/jobs/src/test/java/com/example/JobsIntegrationTests.java
+++ b/run/jobs/src/test/java/com/example/JobsIntegrationTests.java
@@ -104,15 +104,22 @@ public void generatesLogs() throws Exception {
               + "\" -protoPayload.serviceName=\"run.googleapis.com\"";
 
       System.out.println(logFilter);
-      Page<LogEntry> entries = logging.listLogEntries(EntryListOption.filter(logFilter));
       Boolean found = false;
-      for (LogEntry logEntry : entries.iterateAll()) {
-        if (!logEntry.getLogName().contains("cloudaudit")) {
-          Payload<String> payload = logEntry.getPayload();
-          if (payload.getData().contains("Task")) { 
-            found = true; 
+      // Retry up to 5 times
+      for (int i = 0; i < 5; i++) {
+        Page<LogEntry> entries = logging.listLogEntries(EntryListOption.filter(logFilter));
+        for (LogEntry logEntry : entries.iterateAll()) {
+          if (!logEntry.getLogName().contains("cloudaudit")) {
+            Payload<String> payload = logEntry.getPayload();
+            if (payload.getData().contains("Task")) { 
+              found = true; 
+            }
           }
         }
+        if (found) {
+          break;
+        }
+        Thread.sleep(i * 30000);
       }
       assertTrue("Log was not found.", found);
     }

From 8be0de4f24aac9f1b1b2e363b4ddeff2a34df0c3 Mon Sep 17 00:00:00 2001
From: averikitsch <akitsch@google.com>
Date: Mon, 7 Mar 2022 08:50:18 -0800
Subject: [PATCH 2/3] minor fixes

---
 .../src/test/java/com/example/JobsIntegrationTests.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/run/jobs/src/test/java/com/example/JobsIntegrationTests.java b/run/jobs/src/test/java/com/example/JobsIntegrationTests.java
index a8c4e340792..298f6c4ab53 100644
--- a/run/jobs/src/test/java/com/example/JobsIntegrationTests.java
+++ b/run/jobs/src/test/java/com/example/JobsIntegrationTests.java
@@ -106,19 +106,17 @@ public void generatesLogs() throws Exception {
       System.out.println(logFilter);
       Boolean found = false;
       // Retry up to 5 times
-      for (int i = 0; i < 5; i++) {
+      for (int i = 1; i <= 5; i++) {
         Page<LogEntry> entries = logging.listLogEntries(EntryListOption.filter(logFilter));
         for (LogEntry logEntry : entries.iterateAll()) {
           if (!logEntry.getLogName().contains("cloudaudit")) {
             Payload<String> payload = logEntry.getPayload();
             if (payload.getData().contains("Task")) { 
-              found = true; 
+              found = true;
+              break;
             }
           }
         }
-        if (found) {
-          break;
-        }
         Thread.sleep(i * 30000);
       }
       assertTrue("Log was not found.", found);

From 717f562b33e59f6f421d1e0221e68e1dd5a9179d Mon Sep 17 00:00:00 2001
From: averikitsch <akitsch@google.com>
Date: Mon, 7 Mar 2022 09:00:27 -0800
Subject: [PATCH 3/3] Update

---
 run/jobs/src/test/java/com/example/JobsIntegrationTests.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/run/jobs/src/test/java/com/example/JobsIntegrationTests.java b/run/jobs/src/test/java/com/example/JobsIntegrationTests.java
index 298f6c4ab53..4d9ded0e1e6 100644
--- a/run/jobs/src/test/java/com/example/JobsIntegrationTests.java
+++ b/run/jobs/src/test/java/com/example/JobsIntegrationTests.java
@@ -117,7 +117,10 @@ public void generatesLogs() throws Exception {
             }
           }
         }
-        Thread.sleep(i * 30000);
+        if (found) {
+          break;
+        }
+        TimeUnit.SECONDS.sleep(i * 30);
       }
       assertTrue("Log was not found.", found);
     }