Skip to content

Commit 3c57327

Browse files
authored
[Forwardport main] Minor changes for cypress workflow (opensearch-project#1302)
Signed-off-by: Ryan Liang <[email protected]>
1 parent c775d85 commit 3c57327

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

.github/workflows/integration-tests-workflow.yml

+10-17
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
name: Dashboards observability plugin E2E test
2-
on:
3-
schedule:
4-
- cron: '0 0 * * *'
5-
workflow_dispatch:
2+
3+
on: [pull_request, push]
4+
65
env:
76
PLUGIN_NAME: dashboards-observability
87
OPENSEARCH_DASHBOARDS_VERSION: 'main'
@@ -11,6 +10,7 @@ env:
1110

1211
jobs:
1312
tests:
13+
name: Run test group of ${{ matrix.testgroups }}
1414
env:
1515
# Prevents extra Cypress installation progress messages
1616
CI: 1
@@ -25,7 +25,6 @@ jobs:
2525
java: [11]
2626
testgroups: [
2727
app_analytics_test,
28-
notebooks_test,
2928
datasources_test,
3029
event_analytics_test,
3130
integrations_test,
@@ -130,18 +129,12 @@ jobs:
130129
if: ${{ runner.os == 'Linux' }}
131130
run: |
132131
cd ./OpenSearch-Dashboards
133-
echo "Start checking OpenSearch Dashboards."
134-
for i in {1..60}; do
135-
if grep -q "bundles compiled successfully after" "dashboard.log"; then
136-
echo "OpenSearch Dashboards compiled successfully."
137-
break
138-
fi
139-
if [ $i -eq 60 ]; then
140-
echo "Timeout for 600 seconds reached. OpenSearch Dashboards did not finish compiling."
141-
exit 1
142-
fi
143-
sleep 10
144-
done
132+
if timeout 600 grep -q "bundles compiled successfully after" <(tail -n0 -f dashboard.log); then
133+
echo "OpenSearch Dashboards compiled successfully."
134+
else
135+
echo "Timeout for 600 seconds reached. OpenSearch Dashboards did not finish compiling."
136+
exit 1
137+
fi
145138
146139
- name: Install Cypress
147140
run: |

0 commit comments

Comments
 (0)