From ef8adb13df40bad664224e920b139bdf8da9c526 Mon Sep 17 00:00:00 2001 From: Tyler Ohlsen Date: Tue, 29 Nov 2022 14:23:01 -0800 Subject: [PATCH 1/2] Add branch constants in CI workflow for 2.x Signed-off-by: Tyler Ohlsen --- .github/workflows/remote-integ-tests-workflow.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/remote-integ-tests-workflow.yml b/.github/workflows/remote-integ-tests-workflow.yml index 33c575a8..6fa4da39 100644 --- a/.github/workflows/remote-integ-tests-workflow.yml +++ b/.github/workflows/remote-integ-tests-workflow.yml @@ -12,6 +12,8 @@ on: env: OPENSEARCH_DASHBOARDS_VERSION: '2.x' OPENSEARCH_VERSION: '2.4.0-SNAPSHOT' + OPENSEARCH_DASHBOARDS_FTREPO_VERSION: '2.x' + ANOMALY_DETECTION_PLUGIN_VERSION: '2.x' jobs: test-without-security: name: Run integ tests without security @@ -26,7 +28,7 @@ jobs: with: path: anomaly-detection repository: opensearch-project/anomaly-detection - ref: '2.x' + ref: ${{ env.ANOMALY_DETECTION_PLUGIN_VERSION }} - name: Run Opensearch with plugin run: | cd anomaly-detection @@ -72,7 +74,7 @@ jobs: with: path: opensearch-dashboards-functional-test repository: opensearch-project/opensearch-dashboards-functional-test - ref: 'main' # TODO: change to a branch when the branching strategy in that repo has been established + ref: ${{ env.OPENSEARCH_DASHBOARDS_FTREPO_VERSION }} - name: Get Cypress version id: cypress_version run: | From b3c9d85fbbb868046e589537bfa9af7934fe080f Mon Sep 17 00:00:00 2001 From: Tyler Ohlsen Date: Tue, 29 Nov 2022 16:22:23 -0800 Subject: [PATCH 2/2] Bump to 2.5 Signed-off-by: Tyler Ohlsen --- .github/workflows/remote-integ-tests-workflow.yml | 2 +- opensearch_dashboards.json | 4 ++-- package.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/remote-integ-tests-workflow.yml b/.github/workflows/remote-integ-tests-workflow.yml index 6fa4da39..3936666a 100644 --- a/.github/workflows/remote-integ-tests-workflow.yml +++ b/.github/workflows/remote-integ-tests-workflow.yml @@ -11,7 +11,7 @@ on: - "*" env: OPENSEARCH_DASHBOARDS_VERSION: '2.x' - OPENSEARCH_VERSION: '2.4.0-SNAPSHOT' + OPENSEARCH_VERSION: '2.5.0-SNAPSHOT' OPENSEARCH_DASHBOARDS_FTREPO_VERSION: '2.x' ANOMALY_DETECTION_PLUGIN_VERSION: '2.x' jobs: diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index 9016a686..88dffe38 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "anomalyDetectionDashboards", - "version": "2.4.0.0", - "opensearchDashboardsVersion": "2.4.0", + "version": "2.5.0.0", + "opensearchDashboardsVersion": "2.5.0", "configPath": ["anomaly_detection_dashboards"], "requiredPlugins": ["navigation"], "optionalPlugins": [], diff --git a/package.json b/package.json index da79e8e2..447ed6f9 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "anomaly-detection-dashboards", - "version": "2.4.0.0", + "version": "2.5.0.0", "description": "OpenSearch Anomaly Detection Dashboards Plugin", "main": "index.js", "config": { - "plugin_version": "2.4.0.0", + "plugin_version": "2.5.0.0", "plugin_name": "anomalyDetectionDashboards", "plugin_zip_name": "anomaly-detection-dashboards" },