Skip to content

Commit 82ec923

Browse files
SuZhou-JoeSuZhou-Joe
authored
Merge branch 'main' into dependabot/npm_and_yarn/multi-51b3ba2ceb
2 parents d8013bb + 02ca3df commit 82ec923

File tree

78 files changed

+1456
-983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1456
-983
lines changed

‎.github/actions/start-opensearch/action.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,15 @@ inputs:
2323
required: false
2424

2525
port:
26-
description: 'Port to run OpenSearch. Leave empty to use the default config (9200)'
26+
description: 'HTTP port to run OpenSearch. Leave empty to use the default config (9200)'
2727
required: false
2828
default: '9200'
2929

30+
transport_port:
31+
description: 'Transport port to run OpenSearch transport layer. Leave empty to use the default config (9300-9400)'
32+
required: false
33+
default: '9300-9400'
34+
3035
runs:
3136
using: "composite"
3237
steps:
@@ -128,11 +133,12 @@ runs:
128133
shell: bash
129134
working-directory: ${{ inputs.port }}
130135

131-
- name: Use more space
136+
- name: Use more space and update ports
132137
run: |
133138
echo '' >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/config/opensearch.yml
134139
echo "cluster.routing.allocation.disk.threshold_enabled: false" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/config/opensearch.yml
135140
echo "http.port: ${{ inputs.port }}" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/config/opensearch.yml
141+
echo "transport.port: ${{ inputs.transport_port }}" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/config/opensearch.yml
136142
shell: bash
137143
working-directory: ${{ inputs.port }}
138144

‎.github/workflows/assistant-release-e2e-workflow.yml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,41 @@ jobs:
2222
uses: ./.github/workflows/release-e2e-workflow-template.yml
2323
with:
2424
test-name: dashboards assistant
25-
test-command: env CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/*'
25+
test-command: env CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/*chatbot*.js'
2626
osd-serve-args: --assistant.chat.enabled=true
27-
27+
artifact-name-suffix: "-with-security"
28+
2829
tests-without-security:
2930
needs: changes
3031
if: ${{ needs.changes.outputs.tests == 'true' }}
3132
uses: ./.github/workflows/release-e2e-workflow-template.yml
3233
with:
3334
test-name: dashboards assistant
34-
test-command: env CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-without-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/*'
35+
test-command: env CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-without-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/*chatbot*.js'
3536
osd-serve-args: --assistant.chat.enabled=true
3637
security-enabled: false
38+
artifact-name-suffix: "-without-security"
39+
multi-opensearch-enabled: false
40+
3741
tests-with-multiple-data-source-and-disabled-local-cluster:
3842
needs: changes
3943
if: ${{ needs.changes.outputs.tests == 'true' }}
4044
uses: ./.github/workflows/release-e2e-workflow-template.yml
4145
with:
4246
test-name: dashboards assistant
43-
test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/mds*.js'
47+
test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/mds_chatbot*.js'
4448
osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --data_source.hideLocalCluster=true --assistant.chat.enabled=true
4549
security-enabled: true
50+
artifact-name-suffix: "-with-security-and-mds"
51+
52+
tests-with-query-enhancements:
53+
needs: changes
54+
if: ${{ needs.changes.outputs.tests == 'true' }}
55+
uses: ./.github/workflows/release-e2e-workflow-template.yml
56+
with:
57+
test-name: dashboards assistant
58+
test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true CYPRESS_DASHBOARDS_ASSISTANT_ENABLED=true CYPRESS_WORKSPACE_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/dashboards-assistant/mds_query_enhancements*.js'
59+
osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --data_source.hideLocalCluster=true --assistant.chat.enabled=true --uiSettings.overrides.home:useNewHomePage=true --uiSettings.overrides.query:enhancements:enabled=true --workspace.enabled=true --savedObjects.permission.enabled=true --assistant.text2viz.enabled=true --opensearchDashboards.dashboardAdmin.users='["admin"]' --opensearch_security.multitenancy.enabled=false
60+
security-enabled: true
61+
artifact-name-suffix: "-with-query-enhancements"
4662

‎.github/workflows/release-e2e-workflow-template.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ on:
1717
artifact-name-suffix:
1818
required: false
1919
type: string
20+
multi-opensearch-enabled:
21+
required: false
22+
type: boolean
23+
default: true
2024
jobs:
2125
tests:
2226
name: Run Cypress E2E tests for ${{ inputs.test-name }}
@@ -72,16 +76,20 @@ jobs:
7276
curl https://localhost:9200 -u admin:${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }} --insecure
7377
fi
7478
- uses: ./.github/actions/start-opensearch
79+
if: ${{ inputs.multi-opensearch-enabled }}
7580
with:
7681
opensearch-version: ${{ env.VERSION }}
7782
security-enabled: false
7883
port: 9201
84+
transport_port: 9301
7985
- uses: ./.github/actions/start-opensearch
86+
if: ${{ inputs.multi-opensearch-enabled }}
8087
with:
8188
opensearch-version: ${{ env.VERSION }}
8289
security-enabled: true
83-
admin-password: admin
90+
admin-password: myStrongPassword123!
8491
port: 9202
92+
transport_port: 9302
8593
- name: Get OpenSearch-Dashboards
8694
run: |
8795
wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/${{ env.VERSION }}/latest/linux/x64/tar/dist/opensearch-dashboards/opensearch-dashboards-${{ env.VERSION }}-linux-x64.tar.gz
@@ -120,7 +128,7 @@ jobs:
120128
echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
121129
- name: Cache Cypress
122130
id: cache-cypress
123-
uses: actions/cache@v1
131+
uses: actions/cache@v4
124132
with:
125133
path: ~/.cache/Cypress
126134
key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }}

‎.github/workflows/release-signoff-chrome.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
7272
- name: Cache Cypress
7373
id: cache-cypress
74-
uses: actions/cache@v1
74+
uses: actions/cache@v4
7575
with:
7676
path: ~/.cache/Cypress
7777
key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }}

‎.github/workflows/release-signoff-chromium-ad-only.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
6161
- name: Cache Cypress
6262
id: cache-cypress
63-
uses: actions/cache@v1
63+
uses: actions/cache@v4
6464
with:
6565
path: ~/.cache/Cypress
6666
key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }}

‎.github/workflows/release-signoff-chromium-ism-only.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
6161
- name: Cache Cypress
6262
id: cache-cypress
63-
uses: actions/cache@v1
63+
uses: actions/cache@v4
6464
with:
6565
path: ~/.cache/Cypress
6666
key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }}

‎.github/workflows/release-signoff-chromium-tests-in-memory-0.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
6161
- name: Cache Cypress
6262
id: cache-cypress
63-
uses: actions/cache@v1
63+
uses: actions/cache@v4
6464
with:
6565
path: ~/.cache/Cypress
6666
key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }}

‎.github/workflows/release-signoff-chromium-tests-in-memory-10.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
6161
- name: Cache Cypress
6262
id: cache-cypress
63-
uses: actions/cache@v1
63+
uses: actions/cache@v4
6464
with:
6565
path: ~/.cache/Cypress
6666
key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }}

‎.github/workflows/release-signoff-chromium-tests-in-memory-20.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
6161
- name: Cache Cypress
6262
id: cache-cypress
63-
uses: actions/cache@v1
63+
uses: actions/cache@v4
6464
with:
6565
path: ~/.cache/Cypress
6666
key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }}

‎.github/workflows/release-signoff-chromium-tests-in-memory-5.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
echo "cypress_version=$cypress_version_temp" >> $GITHUB_ENV
6161
- name: Cache Cypress
6262
id: cache-cypress
63-
uses: actions/cache@v1
63+
uses: actions/cache@v4
6464
with:
6565
path: ~/.cache/Cypress
6666
key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }}

0 commit comments

Comments
 (0)