From 1c08cc16fc1e02c84bf603a9bfd294b5caba9a8d Mon Sep 17 00:00:00 2001 From: Ryan Liang <109499885+RyanL1997@users.noreply.github.com> Date: Mon, 28 Nov 2022 11:49:25 -0800 Subject: [PATCH] 2.x version bump to 2.5.0 (#1221) * Increment Version to 2.5.0 and add web driver for selenium test case Signed-off-by: Ryan Liang --- .github/workflows/cypress-test.yml | 4 ++-- .github/workflows/integration-test.yml | 10 ++++++++-- .github/workflows/prerequisite-test.yml | 4 ++-- opensearch_dashboards.json | 4 ++-- package.json | 6 +++--- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml index 5ee064d53c..c88812002b 100644 --- a/.github/workflows/cypress-test.yml +++ b/.github/workflows/cypress-test.yml @@ -17,12 +17,12 @@ jobs: steps: - name: Download OpenSearch Core run: | - wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.0/latest/linux/x64/tar/builds/opensearch/dist/opensearch-min-2.4.0-linux-x64.tar.gz + wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/x64/tar/builds/opensearch/dist/opensearch-min-2.5.0-linux-x64.tar.gz tar -xzf opensearch-*.tar.gz rm -f opensearch-*.tar.gz - name: Download OpenSearch Security Plugin - run: wget -O opensearch-security.zip https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.0/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-2.4.0.0.zip + run: wget -O opensearch-security.zip https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-2.5.0.0.zip - name: Run OpenSearch with plugin diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index fe8af301df..ad85c78821 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -11,14 +11,20 @@ jobs: name: Run integration tests runs-on: ubuntu-latest steps: + - uses: browser-actions/setup-geckodriver@latest + - run: geckodriver --version + + - uses: browser-actions/setup-firefox@latest + - run: firefox --version + - name: Download OpenSearch Core run: | - wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.0/latest/linux/x64/tar/builds/opensearch/dist/opensearch-min-2.4.0-linux-x64.tar.gz + wget https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/x64/tar/builds/opensearch/dist/opensearch-min-2.5.0-linux-x64.tar.gz tar -xzf opensearch-*.tar.gz rm -f opensearch-*.tar.gz - name: Download OpenSearch Security Plugin - run: wget -O opensearch-security.zip https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.4.0/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-2.4.0.0.zip + run: wget -O opensearch-security.zip https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-2.5.0.0.zip - name: Run OpenSearch with plugin diff --git a/.github/workflows/prerequisite-test.yml b/.github/workflows/prerequisite-test.yml index 2c71bc042e..c3caa1501c 100644 --- a/.github/workflows/prerequisite-test.yml +++ b/.github/workflows/prerequisite-test.yml @@ -9,6 +9,6 @@ jobs: steps: - name: Check for the existence of the OpenSearch Security Plugin artifact env: - opensearch_version: 2.4.0 - opensearch_security_plugin_version: 2.4.0.0 + opensearch_version: 2.5.0 + opensearch_security_plugin_version: 2.5.0.0 run: wget -S --spider https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/${opensearch_version}/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-${opensearch_security_plugin_version}.zip || (echo "Please make sure security plugin has been bumped to the same version and added to manifest." && exit 1) diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index 8966496d24..a5421825a6 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "securityDashboards", - "version": "2.4.0.0", - "opensearchDashboardsVersion": "2.4.0", + "version": "2.5.0.0", + "opensearchDashboardsVersion": "2.5.0", "configPath": ["opensearch_security"], "requiredPlugins": ["navigation", "savedObjectsManagement"], "server": true, diff --git a/package.json b/package.json index 774112b30f..44bb501731 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "opensearch-security-dashboards", - "version": "2.4.0.0", + "version": "2.5.0.0", "main": "target/plugins/opensearch_security_dashboards", "opensearchDashboards": { - "version": "2.4.0", - "templateVersion": "2.4.0" + "version": "2.5.0", + "templateVersion": "2.5.0" }, "license": "Apache-2.0", "homepage": "https://github.com/opensearch-project/security-dashboards-plugin",