From d80235b8b13086f9250a385b954cc3b3fa79f2be Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 1 Oct 2024 13:44:48 -0400 Subject: [PATCH 1/8] Fix button label Signed-off-by: Derek Ho --- public/apps/configuration/panels/get-started.tsx | 2 +- .../panels/test/__snapshots__/get-started.test.tsx.snap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/apps/configuration/panels/get-started.tsx b/public/apps/configuration/panels/get-started.tsx index 47a7b3a3..51cfd3a1 100644 --- a/public/apps/configuration/panels/get-started.tsx +++ b/public/apps/configuration/panels/get-started.tsx @@ -61,7 +61,7 @@ const addBackendStep = { diff --git a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap index 001b3b6c..180d9330 100644 --- a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap +++ b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap @@ -431,7 +431,7 @@ exports[`Get started (landing page) renders when backend configuration is enable Date: Tue, 1 Oct 2024 14:27:54 -0400 Subject: [PATCH 2/8] Debug Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index 2f8331e6..8c6dd9b8 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -68,9 +68,9 @@ runs: run: | cd ./OpenSearch-Dashboards if [ -z "${{ inputs.osd_base_path }}" ]; then - nohup yarn start --no-base-path --no-watch --csp.warnLegacyBrowsers=false | tee dashboard.log & + yarn start --no-base-path --csp.warnLegacyBrowsers=false else - nohup yarn start --no-watch --csp.warnLegacyBrowsers=false | tee dashboard.log & + yarn start --csp.warnLegacyBrowsers=false fi shell: bash From 05480917aa85b17b9dbe215d8781fd97b41b2c76 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 1 Oct 2024 14:56:03 -0400 Subject: [PATCH 3/8] look for server running instead of bundles compiled Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index 8c6dd9b8..d61162ce 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -68,9 +68,9 @@ runs: run: | cd ./OpenSearch-Dashboards if [ -z "${{ inputs.osd_base_path }}" ]; then - yarn start --no-base-path --csp.warnLegacyBrowsers=false + nohup yarn start --no-base-path --no-watch --csp.warnLegacyBrowsers=false | tee dashboard.log & else - yarn start --csp.warnLegacyBrowsers=false + nohup yarn start --no-watch --csp.warnLegacyBrowsers=false | tee dashboard.log & fi shell: bash @@ -81,7 +81,7 @@ runs: cd ./OpenSearch-Dashboards echo "Start checking OpenSearch Dashboards." for i in {1..60}; do - if grep -q "bundles compiled successfully after" "dashboard.log"; then + if grep -q "http server running at" "dashboard.log"; then echo "OpenSearch Dashboards compiled successfully." break fi From 7d934e161f3e9eabff478de339ec8bff416fe004 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 1 Oct 2024 15:16:01 -0400 Subject: [PATCH 4/8] increase timeout to 900 seconds Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index d61162ce..2acb9f1d 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -80,8 +80,8 @@ runs: run: | cd ./OpenSearch-Dashboards echo "Start checking OpenSearch Dashboards." - for i in {1..60}; do - if grep -q "http server running at" "dashboard.log"; then + for i in {1..90}; do + if grep -q "bundles compiled successfully after" "dashboard.log"; then echo "OpenSearch Dashboards compiled successfully." break fi From 48c087fb0ff0ee2e7ac37dfea8b6ab454bc80fff Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 1 Oct 2024 15:45:05 -0400 Subject: [PATCH 5/8] Actually change timeout to 900 seconds Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index 2acb9f1d..dad78689 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -85,8 +85,8 @@ runs: echo "OpenSearch Dashboards compiled successfully." break fi - if [ $i -eq 60 ]; then - echo "Timeout for 600 seconds reached. OpenSearch Dashboards did not finish compiling." + if [ $i -eq 90 ]; then + echo "Timeout for 900 seconds reached. OpenSearch Dashboards did not finish compiling." exit 1 fi sleep 10 From 514877c092719d4365a15fd378dcbf5ec24dc211 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 2 Oct 2024 11:29:16 -0400 Subject: [PATCH 6/8] Try compile step Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index dad78689..24bf7cbd 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -63,6 +63,11 @@ runs: fi shell: bash + - name: Compile OpenSearch Dashboards + run: | + cd OpenSearch-Dashboards + node scripts/build_opensearch_dashboards_platform_plugins --no-examples --workers=10 --verbose + - name: Run OpenSearch Dashboards with provided configuration if: ${{ runner.os == 'Linux' }} run: | @@ -80,12 +85,12 @@ runs: run: | cd ./OpenSearch-Dashboards echo "Start checking OpenSearch Dashboards." - for i in {1..90}; do + 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 90 ]; then + if [ $i -eq 60 ]; then echo "Timeout for 900 seconds reached. OpenSearch Dashboards did not finish compiling." exit 1 fi From 1e0e5abc35232deeae776bd5ba2874dd95358779 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 2 Oct 2024 11:30:57 -0400 Subject: [PATCH 7/8] Bash Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index 24bf7cbd..8b9b3bb2 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -67,6 +67,7 @@ runs: run: | cd OpenSearch-Dashboards node scripts/build_opensearch_dashboards_platform_plugins --no-examples --workers=10 --verbose + shell: bash - name: Run OpenSearch Dashboards with provided configuration if: ${{ runner.os == 'Linux' }} From 8f83c1edde1f1340b1fa72505a58d62f56936dfc Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 2 Oct 2024 11:52:54 -0400 Subject: [PATCH 8/8] Fix messaging + look for start now that compile is different step Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index 8b9b3bb2..aa49c2ba 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -86,13 +86,13 @@ runs: run: | cd ./OpenSearch-Dashboards echo "Start checking OpenSearch Dashboards." - for i in {1..60}; do - if grep -q "bundles compiled successfully after" "dashboard.log"; then - echo "OpenSearch Dashboards compiled successfully." + for i in {1..6}; do + if grep -q "http server running" "dashboard.log"; then + echo "OpenSearch Dashboards started successfully." break fi - if [ $i -eq 60 ]; then - echo "Timeout for 900 seconds reached. OpenSearch Dashboards did not finish compiling." + if [ $i -eq 6 ]; then + echo "Timeout for 60 seconds reached. OpenSearch Dashboards did not start." exit 1 fi sleep 10