From b4cc013550107a479c68ed66d9dd273b2d8b1253 Mon Sep 17 00:00:00 2001 From: phestecAMZN <111526961+phestecAMZN@users.noreply.github.com> Date: Mon, 17 Oct 2022 12:23:54 -0700 Subject: [PATCH] Backport - 2.x => 2.4 (#286) * Bump 2.x to 2.4 Signed-off-by: Chris Hesterman Signed-off-by: Chris Hesterman --- .github/workflows/cypress-workflow.yml | 4 ++-- .github/workflows/unit-tests-workflow.yml | 2 +- cypress/integration/rollups_spec.js | 4 ++-- opensearch_dashboards.json | 14 +++++++++----- package.json | 4 ++-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index da3beabd2..b84036307 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -7,8 +7,8 @@ on: branches: - "*" env: - OPENSEARCH_DASHBOARDS_VERSION: '2.3.0' - OPENSEARCH_VERSION: '2.3.0-SNAPSHOT' + OPENSEARCH_DASHBOARDS_VERSION: '2.x' + OPENSEARCH_VERSION: '2.4.0-SNAPSHOT' jobs: tests: name: Run Cypress E2E tests diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml index 88f75e664..2b9eaa741 100644 --- a/.github/workflows/unit-tests-workflow.yml +++ b/.github/workflows/unit-tests-workflow.yml @@ -7,7 +7,7 @@ on: branches: - "*" env: - OPENSEARCH_DASHBOARDS_VERSION: '2.3' + OPENSEARCH_DASHBOARDS_VERSION: '2.x' jobs: tests: name: Run unit tests diff --git a/cypress/integration/rollups_spec.js b/cypress/integration/rollups_spec.js index 25fa7c53d..dd2b3f024 100644 --- a/cypress/integration/rollups_spec.js +++ b/cypress/integration/rollups_spec.js @@ -18,8 +18,8 @@ describe("Rollups", () => { cy.wait(10000) - // // Click on "Sample data" tab - // cy.contains("Add data").click({ force: true }); + // Click on "Sample data" tab + cy.contains("Add data").click({ force: true }); // Load sample eCommerce data cy.get(`button[data-test-subj="addSampleDataSetecommerce"]`).click({ force: true }); diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index dee3582c8..536e87f7a 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,9 +1,13 @@ { "id": "indexManagementDashboards", - "version": "2.3.0.0", - "opensearchDashboardsVersion": "2.3.0", - "configPath": ["opensearch_index_management"], - "requiredPlugins": ["navigation"], + "version": "2.4.0.0", + "opensearchDashboardsVersion": "2.4.0", + "configPath": [ + "opensearch_index_management" + ], + "requiredPlugins": [ + "navigation" + ], "server": true, "ui": true -} +} \ No newline at end of file diff --git a/package.json b/package.json index ad3c7f3f7..15b7f78aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opensearch_index_management_dashboards", - "version": "2.3.0.0", + "version": "2.4.0.0", "description": "Opensearch Dashboards plugin for Index Management", "main": "index.js", "license": "Apache-2.0", @@ -64,4 +64,4 @@ "engines": { "yarn": "^1.21.1" } -} +} \ No newline at end of file