fix: ensure all retry.sh failures fail exit 1 (#4037)

* fix: ensure all retry.sh failures fail exit 1

* auto format

* Format Document

* revert Format Document (does not match gts)

* manual gts lint

---------

Co-authored-by: Jennifer Davis <[email protected]>

Author: glasnt

run/markdown-preview/editor/test/retry.sh

@@ -33,35 +33,32 @@
 # If first cmd executes successfully then execute second cmd
 runIfSuccessful() {
   echo "running: $1"
-  $($1 > /dev/null)
+  $($1 >/dev/null)
   if [ $? -eq 0 ]; then
     echo "running: $2"
-    $($2 > /dev/null)
+    $($2 >/dev/null)
   fi
 }
 
 # Define max retries
-max_attempts=3;
-attempt_num=1;
+max_attempts=3
+attempt_num=1
 
 arg1="$1"
 arg2="$2"
 
-if [ $# -eq 1 ]
-then
+if [ $# -eq 1 ]; then
   cmd="$arg1"
 else
   cmd="runIfSuccessful \"$arg1\" \"$arg2\""
 fi
 
-until eval $cmd
-do
-    if ((attempt_num==max_attempts))
-    then
-        echo "Attempt $attempt_num / $max_attempts failed! No more retries left!"
-        exit
-    else
-        echo "Attempt $attempt_num / $max_attempts failed!"
-        sleep $((attempt_num++))
-    fi
+until eval $cmd; do
+  if ((attempt_num == max_attempts)); then
+    echo "Attempt $attempt_num / $max_attempts failed! No more retries left!"
+    exit 1
+  else
+    echo "Attempt $attempt_num / $max_attempts failed!"
+    sleep $((attempt_num++))
+  fi
 done

run/markdown-preview/editor/test/system.test.js

@@ -40,8 +40,11 @@ describe('End-to-End Tests', () => {
       `gcloud builds submit --project ${GOOGLE_CLOUD_PROJECT} ` +
       '--config ../renderer/test/e2e_test_setup.yaml ' +
       `--substitutions _SERVICE=renderer-${SERVICE_NAME},_REGION=${REGION}`;
+
     if (SAMPLE_VERSION) buildRendererCmd += `,_VERSION=${SAMPLE_VERSION}`;
-    if (SERVICE_ACCOUNT) buildRendererCmd += `,_SERVICE_ACCOUNT=${SERVICE_ACCOUNT}`;
+    if (SERVICE_ACCOUNT) {
+      buildRendererCmd += `,_SERVICE_ACCOUNT=${SERVICE_ACCOUNT}`;
+    }
 
     console.log('Starting Cloud Build for Renderer service...');
     execSync(buildRendererCmd, {cwd: '../renderer'});

run/markdown-preview/renderer/test/retry.sh

@@ -33,35 +33,32 @@
 # If first cmd executes successfully then execute second cmd
 runIfSuccessful() {
   echo "running: $1"
-  $($1 > /dev/null)
+  $($1 >/dev/null)
   if [ $? -eq 0 ]; then
     echo "running: $2"
-    $($2 > /dev/null)
+    $($2 >/dev/null)
   fi
 }
 
 # Define max retries
-max_attempts=3;
-attempt_num=1;
+max_attempts=3
+attempt_num=1
 
 arg1="$1"
 arg2="$2"
 
-if [ $# -eq 1 ]
-then
+if [ $# -eq 1 ]; then
   cmd="$arg1"
 else
   cmd="runIfSuccessful \"$arg1\" \"$arg2\""
 fi
 
-until eval $cmd
-do
-    if ((attempt_num==max_attempts))
-    then
-        echo "Attempt $attempt_num / $max_attempts failed! No more retries left!"
-        exit
-    else
-        echo "Attempt $attempt_num / $max_attempts failed!"
-        sleep $((attempt_num++))
-    fi
+until eval $cmd; do
+  if ((attempt_num == max_attempts)); then
+    echo "Attempt $attempt_num / $max_attempts failed! No more retries left!"
+    exit 1
+  else
+    echo "Attempt $attempt_num / $max_attempts failed!"
+    sleep $((attempt_num++))
+  fi
 done

run/markdown-preview/renderer/test/system.test.js

@@ -33,7 +33,6 @@ describe('End-to-End Tests', () => {
   const {SERVICE_ACCOUNT} = process.env;
   const REGION = 'us-central1';
 
-
   let BASE_URL;
   before(async () => {
     // Deploy service using Cloud Build
@@ -55,7 +54,6 @@ describe('End-to-End Tests', () => {
     );
     BASE_URL = url.toString('utf-8').trim();
     if (!BASE_URL) throw Error('Cloud Run service URL not found');
-
   });
 
   after(() => {