Add log check step for both workflows

Signed-off-by: Ryan Liang <[email protected]>
RyanL1997 · Nov 29, 2023 · 6abffa4 · 6abffa4
1 parent 6462587
commit 6abffa4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/.github/workflows/cypress-test-oidc-e2e.yml b/.github/workflows/cypress-test-oidc-e2e.yml
@@ -232,6 +232,11 @@ jobs:
           echo 'HERE IS THE DASHBOARD CONFIG'
           cat ./config/opensearch_dashboards.yml
           nohup yarn start --no-base-path --no-watch | tee dashboard.log &
+
+      - name : Check If OpenSearch Dashboard is ready
+        if: ${{ runner.os == 'Linux' }}
+        run: |
+          cd ./OpenSearch-Dashboards
           for i in {1..60}; do
             if grep -q "bundles compiled successfully after" "dashboard.log"; then
               echo "OpenSearch Dashboards compiled successfully."

diff --git a/.github/workflows/cypress-test-saml-e2e.yml b/.github/workflows/cypress-test-saml-e2e.yml
@@ -195,8 +195,23 @@ jobs:
           EOT
           echo 'HERE IS THE DASHBOARD CONFIG'
           cat ./config/opensearch_dashboards.yml
-          nohup yarn start --no-base-path --no-watch &
-          sleep 600
+          nohup yarn start --no-base-path --no-watch | tee dashboard.log &
+
+      - name : Check If OpenSearch Dashboard is ready
+        if: ${{ runner.os == 'Linux' }}
+        run: |
+          cd ./OpenSearch-Dashboards
+          for i in {1..60}; do
+            if grep -q "bundles compiled successfully after" "dashboard.log"; then
+              echo "OpenSearch Dashboards compiled successfully."
+              break
+            fi
+            if [ $i -eq 60 ]; then
+              echo "Timeout for 600 seconds reached. OpenSearch Dashboards did not finish compiling."
+              exit 1
+            fi
+            sleep 10
+          done
 
       - name: Run Cypress
         run : |