From 79986087cbc147bf0155bc83124d12c040005ac3 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Tue, 4 Mar 2025 12:01:52 -0800 Subject: [PATCH] revert to checking older running message Signed-off-by: Shenoy Pratik --- .../ftr-e2e-dashboards-observability-test.yml | 10 +++++----- .github/workflows/integration-tests-workflow.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ftr-e2e-dashboards-observability-test.yml b/.github/workflows/ftr-e2e-dashboards-observability-test.yml index 8d5101948..2d956e45d 100644 --- a/.github/workflows/ftr-e2e-dashboards-observability-test.yml +++ b/.github/workflows/ftr-e2e-dashboards-observability-test.yml @@ -150,13 +150,13 @@ jobs: - name: Check If OpenSearch Dashboards Is Ready if: ${{ runner.os == 'Linux' }} run: | - if timeout 1200 grep -q "bundles compiled successfully after" <(tail -n0 -f dashboard.log); then - echo "OpenSearch Dashboards compiled successfully." + cd ./OpenSearch-Dashboards + if timeout 1200 grep -q "http server running" <(tail -n +1 -f dashboard.log); then + echo "OpenSearch Dashboards started successfully." else - echo "Timeout for 1200 seconds reached. OpenSearch Dashboards did not finish compiling." + echo "Timeout of 1200 seconds reached. OpenSearch Dashboards did not start successfully." exit 1 - fi - working-directory: OpenSearch-Dashboards + fi& - name: Upload Dashboards logs uses: actions/upload-artifact@v4 diff --git a/.github/workflows/integration-tests-workflow.yml b/.github/workflows/integration-tests-workflow.yml index 603619bb9..5041a3a4f 100644 --- a/.github/workflows/integration-tests-workflow.yml +++ b/.github/workflows/integration-tests-workflow.yml @@ -163,13 +163,13 @@ jobs: - name: Check If OpenSearch Dashboards Is Ready if: ${{ runner.os == 'Linux' }} run: | - if timeout 1200 grep -q "bundles compiled successfully after" <(tail -n0 -f dashboard.log); then - echo "OpenSearch Dashboards compiled successfully." + cd ./OpenSearch-Dashboards + if timeout 1200 grep -q "http server running" <(tail -n +1 -f dashboard.log); then + echo "OpenSearch Dashboards started successfully." else - echo "Timeout for 1200 seconds reached. OpenSearch Dashboards did not finish compiling." + echo "Timeout of 1200 seconds reached. OpenSearch Dashboards did not start successfully." exit 1 - fi - working-directory: OpenSearch-Dashboards + fi& - name: Upload Dashboards logs uses: actions/upload-artifact@v4