Skip to content

Commit

Permalink
CI fixes for adapting admin password change and fix the Cypress brows…
Browse files Browse the repository at this point in the history
…er (#1596)

* Add the random admin password flow

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Pass --headless=old

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Switch to firefox for cypress

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Fix the typo of firefox driver

Signed-off-by: Ryan Liang <jiallian@amazon.com>

* Directly changed admin password into admin in ci

Signed-off-by: Ryan Liang <jiallian@amazon.com>

---------

Signed-off-by: Ryan Liang <jiallian@amazon.com>
  • Loading branch information
RyanL1997 authored Oct 3, 2023
1 parent aaee6ee commit 1e7b421
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/cypress-test-tenancy-disabled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
opensearch-version: ${{ env.OPENSEARCH_VERSION }}
plugin-name: ${{ env.PLUGIN_NAME }}
setup-script-name: setup
admin-password: admin

- name: Run Dashboard with Security Dashboards Plugin
uses: ./.github/actions/install-dashboards
Expand All @@ -73,4 +74,4 @@ jobs:
git clone https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
cd opensearch-dashboards-functional-test
npm install cypress --save-dev
yarn cypress:run-with-security --browser chrome --spec "cypress/integration/plugins/security-dashboards-plugin/inaccessible_tenancy_features.js"
yarn cypress:run-with-security --browser firefox --spec "cypress/integration/plugins/security-dashboards-plugin/inaccessible_tenancy_features.js"
9 changes: 5 additions & 4 deletions .github/workflows/cypress-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
os: [ ubuntu-latest , windows-latest ]
runs-on: ${{ matrix.os }}

steps:
steps:
- name: Set up JDK
uses: actions/setup-java@v1
with:
Expand Down Expand Up @@ -50,6 +50,7 @@ jobs:
opensearch-version: ${{ env.OPENSEARCH_VERSION }}
plugin-name: ${{ env.PLUGIN_NAME }}
setup-script-name: setup
admin-password: admin

- name: Run Dashboard with Security Dashboards Plugin
uses: ./.github/actions/install-dashboards
Expand All @@ -75,6 +76,6 @@ jobs:
git clone https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
cd opensearch-dashboards-functional-test
npm install cypress --save-dev
yarn cypress:run-with-security-and-aggregation-view --browser chrome --spec "cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js"
yarn cypress:run-with-security --browser chrome --spec "cypress/integration/plugins/security-dashboards-plugin/multi_tenancy.js"
yarn cypress:run-with-security --browser chrome --spec "cypress/integration/plugins/security-dashboards-plugin/default_tenant.js"
yarn cypress:run-with-security-and-aggregation-view --browser firefox --spec "cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js"
yarn cypress:run-with-security --browser firefox --spec "cypress/integration/plugins/security-dashboards-plugin/multi_tenancy.js"
yarn cypress:run-with-security --browser firefox --spec "cypress/integration/plugins/security-dashboards-plugin/default_tenant.js"
3 changes: 2 additions & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- name: Checkout Branch
uses: actions/checkout@v3

- name: Set up JDK
uses: actions/setup-java@v1
with:
Expand Down Expand Up @@ -64,6 +64,7 @@ jobs:
opensearch-version: ${{ env.OPENSEARCH_VERSION }}
plugin-name: ${{ env.PLUGIN_NAME }}
setup-script-name: setup
admin-password: admin

- id: install-dashboards
uses: ./.github/actions/install-dashboards
Expand Down

0 comments on commit 1e7b421

Please sign in to comment.