fix: delete Cloud Run Job resource after test

averikitsch · Shabirmean · commit f8f4cedd8fef · 2023-04-25T08:02:10.000-04:00
diff --git a/run/jobs/README.md b/run/jobs/README.md
@@ -32,7 +32,7 @@ mvn clean verify
 ## Create a Job
 
 ```
-gcloud alpha run jobs create job-quickstart \
+gcloud run jobs create job-quickstart \
   --image=gcr.io/$PROJECT_ID/logger-job \
   --tasks 50 \
   --set-env-vars=SLEEP_MS=10000 \
@@ -42,5 +42,5 @@ gcloud alpha run jobs create job-quickstart \
 
 ## Run the Job
 ```
-gcloud alpha run jobs run job-quickstart
+gcloud run jobs run job-quickstart
 ```
diff --git a/run/jobs/src/test/java/com/example/JobsIntegrationTests.java b/run/jobs/src/test/java/com/example/JobsIntegrationTests.java
@@ -27,7 +27,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.channels.InterruptedByTimeoutException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -78,15 +77,21 @@ public static void cleanup() throws IOException, InterruptedException {
         "gcloud",
         "builds",
         "submit",
-        "--config",
-        "./src/test/java/com/example/resources/e2e_test_cleanup.yaml",
-        "--region=us-central1",
         "--project=" + project,
-        String.format("--substitutions _SERVICE=%s,_VERSION=%s", service, suffix));
+        "--config=./src/test/java/com/example/resources/e2e_test_cleanup.yaml",
+        String.format("--substitutions=_SERVICE=%s,_VERSION=%s", service, suffix));
 
+    cleanup.redirectErrorStream(true);
     System.out.println("Deleting Cloud Run job: " + service);
     Process p = cleanup.start();
-    p.waitFor(5, TimeUnit.MINUTES);
+
+    BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+    String line;
+    while ((line = in.readLine()) != null) {
+      System.out.println(line);
+    }
+    in.close();
+    System.out.println("Cloud Build completed.");
   }
 
   @Test
@@ -105,15 +110,15 @@ public void generatesLogs() throws Exception {
               + rfc3339.format(calendar.getTime())
               + "\" -protoPayload.serviceName=\"run.googleapis.com\"";
 
-      System.out.println(logFilter);
+      System.out.println("Log Filter: " + logFilter);
       Boolean found = false;
       // Retry up to 5 times
       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")) { 
+            if (payload.getData().contains("Task")) {
               found = true;
               break;
             }
diff --git a/run/jobs/src/test/java/com/example/resources/e2e_test_cleanup.yaml b/run/jobs/src/test/java/com/example/resources/e2e_test_cleanup.yaml
@@ -23,8 +23,8 @@ steps:
       ./src/test/java/com/example/resources/retry.sh "gcloud container images describe gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}" \
         "gcloud container images delete gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} --quiet"
 
-      ./src/test/java/com/example/resources/retry.sh "gcloud alpha run jobs describe ${_SERVICE} --region ${_REGION}" \
-        "gcloud alpha run jobs delete ${_SERVICE} --region ${_REGION} --quiet"
+      ./src/test/java/com/example/resources/retry.sh "gcloud run jobs describe ${_SERVICE} --region ${_REGION}" \
+        "gcloud run jobs delete ${_SERVICE} --region ${_REGION} --quiet"
 
 substitutions:
   _SERVICE: logger-job
diff --git a/run/jobs/src/test/java/com/example/resources/e2e_test_setup.yaml b/run/jobs/src/test/java/com/example/resources/e2e_test_setup.yaml
@@ -28,9 +28,7 @@ steps:
   args:
   - '-c'
   - |
-    gcloud components update --quiet
-    
-    ./src/test/java/com/example/resources/retry.sh "gcloud alpha run jobs create ${_SERVICE} \
+    ./src/test/java/com/example/resources/retry.sh "gcloud run jobs create ${_SERVICE} \
       --image gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} \
       --region ${_REGION} \
       --tasks 5 \
