Skip to content

Commit

Permalink
Reduce time and update creds
Browse files Browse the repository at this point in the history
Signed-off-by: Craig Perkins <[email protected]>
  • Loading branch information
cwperks committed Nov 1, 2024
1 parent ef8a26d commit 14fafe6
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/actions/run-cypress-tests/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ runs:
run: |
cd OpenSearch-Dashboards
yarn start --no-base-path --no-watch --server.host="0.0.0.0" &
sleep 420
sleep 30
# in main branch, OSD server requires more time to bundle and bootstrap
# timeout 300 bash -c 'while [[ "$(curl -s localhost:5601/api/status | jq -r '.status.overall.state')" != "green" ]]; do sleep 5; done'
# for now just chrome, use matrix to do all browsers later
Expand Down
76 changes: 43 additions & 33 deletions cypress.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,48 @@
{
"defaultCommandTimeout": 60000,
"requestTimeout": 60000,
"responseTimeout": 60000,
"baseUrl": "http://localhost:5601",
"viewportWidth": 2000,
"viewportHeight": 1320,
"env": {
"openSearchUrl": "http://localhost:9200",
"SECURITY_ENABLED": false,
"username": "admin",
"password": "myStrongPassword123!"
},
"clientCertificates": [
"defaultCommandTimeout": 60000,
"requestTimeout": 60000,
"responseTimeout": 60000,
"baseUrl": "http://localhost:5601",
"viewportWidth": 2000,
"viewportHeight": 1320,
"env":
{
"url": "https://localhost:9200/.opendistro-ism*",
"ca": ["cypress/resources/root-ca.pem"],
"certs": [
{
"cert": "cypress/resources/kirk.pem",
"key": "cypress/resources/kirk-key.pem",
"passphrase": ""
}
]
"openSearchUrl": "http://localhost:9200",
"SECURITY_ENABLED": false,
"username": "admin",
"password": "admin"
},
{
"url": "https://localhost:9200/.opendistro-ism-config/_update_by_query/",
"ca": ["cypress/resources/root-ca.pem"],
"certs": [
"clientCertificates":
[
{
"url": "https://localhost:9200/.opendistro-ism*",
"ca":
[
"cypress/resources/root-ca.pem"
],
"certs":
[
{
"cert": "cypress/resources/kirk.pem",
"key": "cypress/resources/kirk-key.pem",
"passphrase": ""
}
]
},
{
"cert": "cypress/resources/kirk.pem",
"key": "cypress/resources/kirk-key.pem",
"passphrase": ""
"url": "https://localhost:9200/.opendistro-ism-config/_update_by_query/",
"ca":
[
"cypress/resources/root-ca.pem"
],
"certs":
[
{
"cert": "cypress/resources/kirk.pem",
"key": "cypress/resources/kirk-key.pem",
"passphrase": ""
}
]
}
]
}
]
}
]
}

0 comments on commit 14fafe6

Please sign in to comment.