Backport - 2.x => 2.4 (#286)

* Bump 2.x to 2.4 Signed-off-by: Chris Hesterman <[email protected]> Signed-off-by: Chris Hesterman <[email protected]>
opensearch-project · Oct 17, 2022 · b4cc013 · b4cc013
1 parent b50582a
commit b4cc013
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
-}
+}
diff --git 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"
   }
-}
+}