From 8b630df015b2649490f1886d75b7b8df7b9a5d27 Mon Sep 17 00:00:00 2001 From: AWSHurneyt Date: Tue, 5 Apr 2022 08:23:01 -0700 Subject: [PATCH] Bumped main branch version to 2.0 to align with OpenSearch-Dashboards. Added alpha1 qualifier to align with backend snapshot version. (#202) * Bumped main branch version to 2.0 to align with OpenSearch-Dashboards. Added alpha1 qualifier to backend snapshot version. Signed-off-by: AWSHurneyt * Fixed a cypress test that started failing after this bump. Signed-off-by: AWSHurneyt --- .github/workflows/cypress-workflow.yml | 4 ++-- cypress/integration/cluster_metrics_monitor_spec.js | 2 +- opensearch_dashboards.json | 4 ++-- package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 43ea9916d..5459f2fbe 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -9,8 +9,8 @@ on: - main - 1.x env: - OPENSEARCH_DASHBOARDS_VERSION: '1.x' - OPENSEARCH_VERSION: '1.3.0-SNAPSHOT' + OPENSEARCH_DASHBOARDS_VERSION: 'main' + OPENSEARCH_VERSION: '2.0.0-alpha1-SNAPSHOT' jobs: tests: name: Run Cypress E2E tests diff --git a/cypress/integration/cluster_metrics_monitor_spec.js b/cypress/integration/cluster_metrics_monitor_spec.js index 5bb6d81a1..8df3e0409 100644 --- a/cypress/integration/cluster_metrics_monitor_spec.js +++ b/cypress/integration/cluster_metrics_monitor_spec.js @@ -291,7 +291,7 @@ describe('ClusterMetricsMonitor', () => { describe('the modal CLOSE (i.e., the X button) button is clicked', () => { // Click the CLOSE button - cy.get('[class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"]').click(); + cy.get('[aria-label="Closes this modal window"]').click(); // Confirm clearTriggersModal closed cy.get('[data-test-subj="clusterMetricsClearTriggersModal"]').should('not.exist'); diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index 5106d4272..2bd90fa32 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "alertingDashboards", - "version": "1.3.0.0", - "opensearchDashboardsVersion": "1.3.0", + "version": "2.0.0.0", + "opensearchDashboardsVersion": "2.0.0", "configPath": ["opensearch_alerting"], "requiredPlugins": [], "server": true, diff --git a/package.json b/package.json index f31323e0d..4e199b988 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opensearch-alerting-dashboards", - "version": "1.3.0.0", + "version": "2.0.0.0", "description": "OpenSearch Dashboards Alerting Plugin", "main": "index.js", "license": "Apache-2.0",