From f8bc0fe549ba123756230359681362126d79af48 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 1 Jun 2023 12:46:38 -0400 Subject: [PATCH] Use version from package.json for integration tests Signed-off-by: Craig Perkins --- .github/workflows/cypress-test.yml | 10 ++++++++-- .github/workflows/integration-test.yml | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml index 77ab0db4e..c5e5370c1 100644 --- a/.github/workflows/cypress-test.yml +++ b/.github/workflows/cypress-test.yml @@ -9,9 +9,7 @@ env: START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --opensearch_security.multitenancy.enable_aggregation_view=true' OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot' SPEC: 'cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js,' - OPENSEARCH_VERSION: 2.8.0 PLUGIN_NAME: opensearch-security - PLUGIN_VERSION: 2.8.0.0 jobs: tests: @@ -31,6 +29,14 @@ jobs: - name: Checkout Branch uses: actions/checkout@v3 + - name: Set env + run: | + opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") + plugin_version=$(node -p "require('./package.json').version") + echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV + echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV + shell: bash + - name: Download security plugin and create setup scripts uses: ./.github/actions/download-plugin with: diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 8d0488033..b97526175 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -5,9 +5,7 @@ on: [push, pull_request] env: TEST_BROWSER_HEADLESS: 1 CI: 1 - OPENSEARCH_VERSION: 2.8.0 PLUGIN_NAME: opensearch-security - PLUGIN_VERSION: 2.8.0.0 jobs: tests: @@ -27,6 +25,14 @@ jobs: with: java-version: 11 + - name: Set env + run: | + opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") + plugin_version=$(node -p "require('./package.json').version") + echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV + echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV + shell: bash + - uses: browser-actions/setup-geckodriver@v0.0.0 - run: geckodriver --version