34
34
FTR_PATH : ' ftr'
35
35
START_CMD : ' node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true --csp.warnLegacyBrowsers=false --uiSettings.overrides["query:enhancements:enabled"]=false'
36
36
OPENSEARCH_SNAPSHOT_CMD : ' node ../scripts/opensearch snapshot -E cluster.routing.allocation.disk.threshold_enabled=false'
37
+ START_CMD_QUERY_ENHANCED : ' node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true --csp.warnLegacyBrowsers=false --uiSettings.overrides["query:enhancements:enabled"]=true --uiSettings.overrides[' home:useNewHomePage']=true --workspace.enabled=true --data_source.enabled=true'
38
+ OPENSEARCH_SNAPSHOT_CMD_QUERY_ENHANCED : ' node ../scripts/opensearch snapshot -E cluster.routing.allocation.disk.threshold_enabled=false --sql'
37
39
CYPRESS_BROWSER : ' chromium'
38
40
CYPRESS_VISBUILDER_ENABLED : true
39
41
CYPRESS_DATASOURCE_MANAGEMENT_ENABLED : false
49
51
strategy :
50
52
fail-fast : false
51
53
matrix :
52
- group : [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
54
+ group : [1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11 ]
53
55
container :
54
56
image : docker://opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2
55
57
options : --user 1001
@@ -117,7 +119,7 @@ jobs:
117
119
118
120
# Setup spec files for existing Functional Test repo cypress tests
119
121
- name : Setup spec files
120
- if : ${{ inputs.specs == '' && matrix.group < 10 }}
122
+ if : ${{ inputs.specs == '' && matrix.group < 11 }}
121
123
working-directory : ${{ env.FTR_PATH }}
122
124
shell : bash
123
125
run : |
@@ -129,7 +131,7 @@ jobs:
129
131
echo "SPEC=${FORMATTED_SPEC}" >> $GITHUB_ENV
130
132
131
133
- name : Get Cypress version
132
- if : ${{ matrix.group < 10 }}
134
+ if : ${{ matrix.group < 11 }}
133
135
id : cypress_version
134
136
run : |
135
137
echo "name=cypress_version::$(cat ./${{ env.FTR_PATH }}/package.json | jq '.devDependencies.cypress' | tr -d '"')" >> $GITHUB_OUTPUT
@@ -148,7 +150,7 @@ jobs:
148
150
149
151
# Setup spec files for Dashboards in-house cypress tests
150
152
- name : Setup spec files for Dashboards tests
151
- if : ${{ inputs.specs == '' && matrix.group > 9 }}
153
+ if : ${{ inputs.specs == '' && matrix.group > 10 }}
152
154
shell : bash
153
155
run : |
154
156
IFS="," read -a SPEC_ARRAY <<< $(yarn --silent osd:ciGroup${{ matrix.group }})
@@ -167,15 +169,25 @@ jobs:
167
169
start : ${{ env.OPENSEARCH_SNAPSHOT_CMD }}, ${{ env.START_CMD }}
168
170
wait-on : ' http://localhost:9200, http://localhost:5601'
169
171
command : yarn cypress:run-without-security --browser ${{ env.CYPRESS_BROWSER }} --spec ${{ env.SPEC }}
172
+
173
+ # Run FT repo tests with query enhancements enabled
174
+ - name : Run FT repo tests with query enhancements enabled
175
+ if : ${{ matrix.group = 10 }}
176
+ uses : cypress-io/github-action@v2
177
+ with :
178
+ working-directory : ${{ env.FTR_PATH }}
179
+ start : ${{ env.OPENSEARCH_SNAPSHOT_CMD_QUERY_ENHANCED }}, ${{ env.START_CMD_QUERY_ENHANCED }}
180
+ wait-on : ' http://localhost:9200, http://localhost:5601'
181
+ command : yarn cypress:run-without-security --browser ${{ env.CYPRESS_BROWSER }} --spec ${{ env.SPEC }}
170
182
171
183
# Clear Cypress Cache before running Dashboards tests
172
184
- name : Clear Cypress Cache
173
- if : ${{ matrix.group > 9 }}
185
+ if : ${{ matrix.group > 10 }}
174
186
run : npx cypress cache clear
175
187
176
188
# Run Dashboards Cypress tests within the source repo
177
189
- name : Run Dashboards Cypress tests
178
- if : ${{ matrix.group > 9 }}
190
+ if : ${{ matrix.group > 10 }}
179
191
uses : cypress-io/github-action@v6
180
192
with :
181
193
install-command : npx cypress install --force
@@ -186,30 +198,30 @@ jobs:
186
198
# Screenshots are only captured on failure, will change this once we do visual regression tests
187
199
- name : Upload FT repo screenshots
188
200
uses : actions/upload-artifact@v3
189
- if : failure() && (matrix.group < 10 )
201
+ if : failure() && (matrix.group < 11 )
190
202
with :
191
203
name : ftr-cypress-screenshots
192
204
path : ${{ env.FTR_PATH }}/cypress/screenshots
193
205
retention-days : 1
194
206
195
207
- name : Upload FT repo videos
196
208
uses : actions/upload-artifact@v3
197
- if : always() && (matrix.group < 10 )
209
+ if : always() && (matrix.group < 11 )
198
210
with :
199
211
name : ftr-cypress-videos
200
212
path : ${{ env.FTR_PATH }}/cypress/videos
201
213
retention-days : 1
202
214
203
215
- name : Upload FT repo results
204
216
uses : actions/upload-artifact@v3
205
- if : always() && (matrix.group < 10 )
217
+ if : always() && (matrix.group < 11 )
206
218
with :
207
219
name : ftr-cypress-results
208
220
path : ${{ env.FTR_PATH }}/cypress/results
209
221
retention-days : 1
210
222
211
223
- name : Upload Dashboards screenshots
212
- if : failure() && (matrix.group > 9 )
224
+ if : failure() && (matrix.group > 10 )
213
225
uses : actions/upload-artifact@v3
214
226
with :
215
227
name : dashboards-cypress-screenshots
@@ -218,15 +230,15 @@ jobs:
218
230
219
231
- name : Upload Dashboards repo videos
220
232
uses : actions/upload-artifact@v3
221
- if : always() && (matrix.group > 9 )
233
+ if : always() && (matrix.group > 10 )
222
234
with :
223
235
name : dashboards-cypress-videos
224
236
path : cypress/videos
225
237
retention-days : 1
226
238
227
239
- name : Upload Dashboards repo results
228
240
uses : actions/upload-artifact@v3
229
- if : always() && (matrix.group > 9 )
241
+ if : always() && (matrix.group > 10 )
230
242
with :
231
243
name : dashboards-cypress-results
232
244
path : cypress/results
0 commit comments