From c0ade1f1c2b0470f37be846145eb12825834f46c Mon Sep 17 00:00:00 2001 From: Clay Downs Date: Fri, 13 May 2022 14:39:48 -0700 Subject: [PATCH] Removes rc1 version qualifier [BACKPORT] (#194) * Removes rc1 version qualifier (#192) * Removes rc1 version qualifier Signed-off-by: Clay Downs * Changes cypress workflow to use OS Dashboards 2.0 branch Signed-off-by: Clay Downs * Updates unit test workflow version Signed-off-by: Clay Downs Signed-off-by: Clay Downs <89109232+downsrob@users.noreply.github.com> * Adds 2.0 branch to cypress workflow Signed-off-by: Clay Downs <89109232+downsrob@users.noreply.github.com> Signed-off-by: Clay Downs * Adds 2.0 branch to unit test workflow Signed-off-by: Clay Downs --- .github/workflows/cypress-workflow.yml | 8 +++++--- .github/workflows/unit-tests-workflow.yml | 4 +++- opensearch_dashboards.json | 2 +- package.json | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 9b78c62e5..5ff70a2f5 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -3,13 +3,15 @@ on: pull_request: branches: - main + - 2.0 push: branches: - main - development-* + - 2.0 env: - OPENSEARCH_DASHBOARDS_VERSION: 'main' - OPENSEARCH_VERSION: '2.0.0-rc1-SNAPSHOT' + OPENSEARCH_DASHBOARDS_VERSION: '2.0' + OPENSEARCH_VERSION: '2.0.0-SNAPSHOT' jobs: tests: name: Run Cypress E2E tests @@ -30,7 +32,7 @@ jobs: with: path: index-management repository: opensearch-project/index-management - ref: 'main' + ref: '2.0' - name: Run opensearch with plugin run: | cd index-management diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml index 4eb05de33..ad7178ba6 100644 --- a/.github/workflows/unit-tests-workflow.yml +++ b/.github/workflows/unit-tests-workflow.yml @@ -3,12 +3,14 @@ on: pull_request: branches: - main + - 2.0 push: branches: - main + - 2.0 - development-* env: - OPENSEARCH_DASHBOARDS_VERSION: 'main' + OPENSEARCH_DASHBOARDS_VERSION: '2.0' jobs: tests: name: Run unit tests diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index dc0189c40..859f70e00 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,6 +1,6 @@ { "id": "indexManagementDashboards", - "version": "2.0.0.0-rc1", + "version": "2.0.0.0", "opensearchDashboardsVersion": "2.0.0", "configPath": ["opensearch_index_management"], "requiredPlugins": ["navigation"], diff --git a/package.json b/package.json index f36a1b4c8..4117e0e8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opensearch_index_management_dashboards", - "version": "2.0.0.0-rc1", + "version": "2.0.0.0", "description": "Opensearch Dashboards plugin for Index Management", "main": "index.js", "license": "Apache-2.0",