Skip to content

Commit 2552c45

Browse files
authored
[Backport 3.7] Backport missing commits from main (#2028)
Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
1 parent 2591435 commit 2552c45

8 files changed

Lines changed: 776 additions & 113 deletions

File tree

.github/workflows/alerting-release-e2e-workflow.yml

Lines changed: 67 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,74 @@ jobs:
1616
- 'cypress/**/alerting-dashboards-plugin/**'
1717
- '.github/workflows/release-e2e-workflow-template.yml'
1818
19-
tests:
19+
tests-acknowledge-alerts-modal:
2020
needs: changes
2121
if: ${{ needs.changes.outputs.tests == 'true' }}
2222
uses: ./.github/workflows/release-e2e-workflow-template.yml
2323
with:
24-
test-name: Alerting
25-
test-command: env CYPRESS_NO_COMMAND_LOG=1 yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/alerting-dashboards-plugin/*'
24+
test-name: Alerting (acknowledge_alerts_modal_spec.js)
25+
test-command: env CYPRESS_NO_COMMAND_LOG=1 yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/alerting-dashboards-plugin/acknowledge_alerts_modal_spec.js'
26+
27+
tests-alert:
28+
needs: changes
29+
if: ${{ needs.changes.outputs.tests == 'true' }}
30+
uses: ./.github/workflows/release-e2e-workflow-template.yml
31+
with:
32+
test-name: Alerting (alert_spec.js)
33+
test-command: env CYPRESS_NO_COMMAND_LOG=1 yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/alerting-dashboards-plugin/alert_spec.js'
34+
35+
tests-alerts-dashboard-flyout:
36+
needs: changes
37+
if: ${{ needs.changes.outputs.tests == 'true' }}
38+
uses: ./.github/workflows/release-e2e-workflow-template.yml
39+
with:
40+
test-name: Alerting (alerts_dashboard_flyout_spec.js)
41+
test-command: env CYPRESS_NO_COMMAND_LOG=1 yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/alerting-dashboards-plugin/alerts_dashboard_flyout_spec.js'
42+
43+
tests-bucket-level-monitor:
44+
needs: changes
45+
if: ${{ needs.changes.outputs.tests == 'true' }}
46+
uses: ./.github/workflows/release-e2e-workflow-template.yml
47+
with:
48+
test-name: Alerting (bucket_level_monitor_spec.js)
49+
test-command: env CYPRESS_NO_COMMAND_LOG=1 yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/alerting-dashboards-plugin/bucket_level_monitor_spec.js'
50+
51+
tests-cluster-metrics-monitor:
52+
needs: changes
53+
if: ${{ needs.changes.outputs.tests == 'true' }}
54+
uses: ./.github/workflows/release-e2e-workflow-template.yml
55+
with:
56+
test-name: Alerting (cluster_metrics_monitor_spec.js)
57+
test-command: env CYPRESS_NO_COMMAND_LOG=1 yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/alerting-dashboards-plugin/cluster_metrics_monitor_spec.js'
58+
59+
tests-composite-level-monitor:
60+
needs: changes
61+
if: ${{ needs.changes.outputs.tests == 'true' }}
62+
uses: ./.github/workflows/release-e2e-workflow-template.yml
63+
with:
64+
test-name: Alerting (composite_level_monitor_spec.js)
65+
test-command: env CYPRESS_NO_COMMAND_LOG=1 yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/alerting-dashboards-plugin/composite_level_monitor_spec.js'
66+
67+
tests-document-level-monitor:
68+
needs: changes
69+
if: ${{ needs.changes.outputs.tests == 'true' }}
70+
uses: ./.github/workflows/release-e2e-workflow-template.yml
71+
with:
72+
test-name: Alerting (document_level_monitor_spec.js)
73+
test-command: env CYPRESS_NO_COMMAND_LOG=1 yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/alerting-dashboards-plugin/document_level_monitor_spec.js'
74+
75+
tests-monitors-dashboard:
76+
needs: changes
77+
if: ${{ needs.changes.outputs.tests == 'true' }}
78+
uses: ./.github/workflows/release-e2e-workflow-template.yml
79+
with:
80+
test-name: Alerting (monitors_dashboard_spec.js)
81+
test-command: env CYPRESS_NO_COMMAND_LOG=1 yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/alerting-dashboards-plugin/monitors_dashboard_spec.js'
82+
83+
tests-query-level-monitor:
84+
needs: changes
85+
if: ${{ needs.changes.outputs.tests == 'true' }}
86+
uses: ./.github/workflows/release-e2e-workflow-template.yml
87+
with:
88+
test-name: Alerting (query_level_monitor_spec.js)
89+
test-command: env CYPRESS_NO_COMMAND_LOG=1 yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/alerting-dashboards-plugin/query_level_monitor_spec.js'
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Dashboard Variable Release tests workflow in Bundled OpenSearch Dashboards
2+
on:
3+
pull_request:
4+
branches: ['**']
5+
6+
jobs:
7+
changes:
8+
runs-on: ubuntu-latest
9+
outputs:
10+
tests: ${{ steps.filter.outputs.tests }}
11+
steps:
12+
- uses: dorny/paths-filter@v2
13+
id: filter
14+
with:
15+
filters: |
16+
tests:
17+
- 'cypress/**/dashboard-variable/**'
18+
- '.github/workflows/dashboard-variable-release-e2e-workflow.yml'
19+
- '.github/workflows/release-e2e-workflow-template.yml'
20+
tests-with-security:
21+
needs: changes
22+
if: ${{ needs.changes.outputs.tests == 'true' }}
23+
uses: ./.github/workflows/release-e2e-workflow-template.yml
24+
with:
25+
test-name: dashboard variable
26+
test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true CYPRESS_WORKSPACE_ENABLED=true CYPRESS_SAVED_OBJECTS_PERMISSION_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/dashboard-variable/*'
27+
osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --data_source.hideLocalCluster=true --workspace.enabled=true --savedObjects.permission.enabled=true --opensearch_security.multitenancy.enabled=false --opensearchDashboards.dashboardAdmin.users='["admin"]' --uiSettings.overrides.home:useNewHomePage=true --explore.enabled=true
28+
artifact-name-suffix: "-with-security"

0 commit comments

Comments
 (0)