Skip to content

Commit 6f114af

Browse files
authored
Cypress workflow improvements (#560) (#570)
Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
1 parent 823e893 commit 6f114af

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

.github/workflows/remote-integ-tests-workflow.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ on:
99
pull_request:
1010
branches:
1111
- "*"
12-
env:
13-
OPENSEARCH_DASHBOARDS_VERSION: '2.x'
14-
OPENSEARCH_DASHBOARDS_FTREPO_VERSION: '2.x'
15-
ANOMALY_DETECTION_PLUGIN_VERSION: '2.x'
1612
jobs:
1713
test-without-security:
1814
name: Run integ tests without security
@@ -41,7 +37,7 @@ jobs:
4137
uses: actions/checkout@v2
4238
with:
4339
repository: opensearch-project/OpenSearch-Dashboards
44-
ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }}
40+
ref: '${{ github.base_ref }}'
4541
path: OpenSearch-Dashboards
4642

4743
- name: Checkout Anomaly Detection OpenSearch Dashboards plugin
@@ -71,7 +67,7 @@ jobs:
7167
with:
7268
path: anomaly-detection
7369
repository: opensearch-project/anomaly-detection
74-
ref: ${{ env.ANOMALY_DETECTION_PLUGIN_VERSION }}
70+
ref: '${{ github.base_ref }}'
7571

7672
- name: Run OpenSearch with plugin
7773
run: |
@@ -110,7 +106,7 @@ jobs:
110106
with:
111107
path: opensearch-dashboards-functional-test
112108
repository: opensearch-project/opensearch-dashboards-functional-test
113-
ref: ${{ env.OPENSEARCH_DASHBOARDS_FTREPO_VERSION }}
109+
ref: '${{ github.base_ref }}'
114110

115111
- name: Get Cypress version
116112
id: cypress_version
@@ -132,6 +128,6 @@ jobs:
132128
uses: cypress-io/github-action@v2
133129
with:
134130
working-directory: opensearch-dashboards-functional-test
135-
command: yarn run cypress run --env SECURITY_ENABLED=false --spec cypress/integration/plugins/anomaly-detection-dashboards-plugin/*.js
131+
command: yarn run cypress run --env SECURITY_ENABLED=false --spec cypress/integration/plugins/anomaly-detection-dashboards-plugin/**/*.js
136132
env:
137133
CYPRESS_CACHE_FOLDER: ${{ matrix.cypress_cache_folder }}

0 commit comments

Comments
 (0)