Merge pull request #264 from solo-io/automation

[bot] Merge automation
solo-io · Oct 24, 2024 · 4f3e39e · 4f3e39e
2 parents 29dd3bf + 7ceb05e
commit 4f3e39e
Show file tree

Hide file tree

Showing 149 changed files with 26,597 additions and 355 deletions.
diff --git a/gloo-gateway/1-17/enterprise-istio-ambient/default/README.md b/gloo-gateway/1-17/enterprise-istio-ambient/default/README.md
diff --git a/gloo-gateway/1-17/enterprise-istio-ambient/default/tests/utils/enhance-browser.js b/gloo-gateway/1-17/enterprise-istio-ambient/default/tests/utils/enhance-browser.js
@@ -66,7 +66,7 @@ function enhanceBrowser(browser, testId = 'test', shouldRecord = true) {
             if (shouldRecord && recorder) {
               debugLog('Stopping recorder...');
               try {
-                await withTimeout(recorder.stop(), 10000, 'Recorder stop timed out');
+                await withTimeout(recorder.stop(), 1000, 'Recorder stop timed out');
                 debugLog('Recorder stopped.');
               } catch (e) {
                 debugLog('Failed to stop recorder:', e);

diff --git a/gloo-gateway/1-17/enterprise-istio-sidecar/default/README.md b/gloo-gateway/1-17/enterprise-istio-sidecar/default/README.md
diff --git a/gloo-gateway/1-17/enterprise-istio-sidecar/default/tests/utils/enhance-browser.js b/gloo-gateway/1-17/enterprise-istio-sidecar/default/tests/utils/enhance-browser.js
@@ -66,7 +66,7 @@ function enhanceBrowser(browser, testId = 'test', shouldRecord = true) {
             if (shouldRecord && recorder) {
               debugLog('Stopping recorder...');
               try {
-                await withTimeout(recorder.stop(), 10000, 'Recorder stop timed out');
+                await withTimeout(recorder.stop(), 1000, 'Recorder stop timed out');
                 debugLog('Recorder stopped.');
               } catch (e) {
                 debugLog('Failed to stop recorder:', e);

diff --git a/gloo-gateway/1-17/enterprise-multicluster-routing/default/README.md b/gloo-gateway/1-17/enterprise-multicluster-routing/default/README.md
@@ -211,6 +211,7 @@ Here is the expected output:
 
 ```,nocopy
 NAME                                         READY   STATUS      RESTARTS   AGE
+caching-service-79cf55ccbb-dcvgp             1/1     Running     0          69s
 extauth-58f68c5cd5-gxgxc                     1/1     Running     0          69s
 gateway-portal-web-server-5c5d58d8d5-7lzwg   1/1     Running     0          69s
 gloo-7d8994697-lfg5x                         1/1     Running     0          69s
@@ -689,7 +690,7 @@ MAX_RETRIES=30
 while [[ $RETRY_COUNT -lt $MAX_RETRIES ]]; do
   echo "Attempt $((RETRY_COUNT + 1))/$MAX_RETRIES"
   ret=`curl -k -s -o /dev/null -w %{http_code} https://httpbin.example.com/get`
-  if [ "$ret" == "200" ]; then
+  if [ "$ret" -eq "200" ]; then
     break
   else
     echo "Response was: $ret"
@@ -1397,6 +1398,7 @@ Here is the expected output:
 
 ```,nocopy
 NAME                                         READY   STATUS      RESTARTS   AGE
+caching-service-79cf55ccbb-dcvgp             1/1     Running     0          69s
 extauth-58f68c5cd5-gxgxc                     1/1     Running     0          69s
 gateway-portal-web-server-5c5d58d8d5-7lzwg   1/1     Running     0          69s
 gloo-7d8994697-lfg5x                         1/1     Running     0          69s

diff --git a/gloo-gateway/1-17/enterprise-multicluster-routing/default/tests/utils/enhance-browser.js b/gloo-gateway/1-17/enterprise-multicluster-routing/default/tests/utils/enhance-browser.js
@@ -66,7 +66,7 @@ function enhanceBrowser(browser, testId = 'test', shouldRecord = true) {
             if (shouldRecord && recorder) {
               debugLog('Stopping recorder...');
               try {
-                await withTimeout(recorder.stop(), 10000, 'Recorder stop timed out');
+                await withTimeout(recorder.stop(), 1000, 'Recorder stop timed out');
                 debugLog('Recorder stopped.');
               } catch (e) {
                 debugLog('Failed to stop recorder:', e);

diff --git a/gloo-gateway/1-17/enterprise-vm/default/README.md b/gloo-gateway/1-17/enterprise-vm/default/README.md
@@ -496,7 +496,7 @@ while [[ $RETRY_COUNT -lt $MAX_RETRIES ]]; do
   sudo systemctl restart gloo-gateway.service
   echo "Attempt $((RETRY_COUNT + 1))/$MAX_RETRIES"
   ret=`curl -k -s -o /dev/null -w %{http_code} https://httpbin.example.com/get`
-  if [ "$ret" == "200" ]; then
+  if [ "$ret" -eq "200" ]; then
     break
   else
     echo "Response was: $ret"

diff --git a/gloo-gateway/1-17/enterprise-vm/default/tests/utils/enhance-browser.js b/gloo-gateway/1-17/enterprise-vm/default/tests/utils/enhance-browser.js
@@ -66,7 +66,7 @@ function enhanceBrowser(browser, testId = 'test', shouldRecord = true) {
             if (shouldRecord && recorder) {
               debugLog('Stopping recorder...');
               try {
-                await withTimeout(recorder.stop(), 10000, 'Recorder stop timed out');
+                await withTimeout(recorder.stop(), 1000, 'Recorder stop timed out');
                 debugLog('Recorder stopped.');
               } catch (e) {
                 debugLog('Failed to stop recorder:', e);