From afa6e3a1c0cdac7391f4b6d29845aaee88df509e Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 17 Jun 2024 10:26:01 -0400 Subject: [PATCH 1/6] Change JDK to 21 for main branch Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index d77adf5a2..8541d65cb 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -22,7 +22,7 @@ runs: - name: Set up JDK uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 21 - name: Set env run: | @@ -41,13 +41,14 @@ runs: download-location: ${{ env.PLUGIN_NAME }} - name: Run Opensearch with A Single Plugin - uses: derek-ho/start-opensearch@v2 + uses: derek-ho/start-opensearch@v5 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/opensearch-security.zip" security-enabled: true admin-password: ${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }} security_config_file: ${{ inputs.security_config_file }} + jdk-version: 21 # OSD bootstrap - name: Run Dashboard with Security Dashboards Plugin From d5b31406b09da6ad50edf927de4ee16f88eee22e Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 17 Jun 2024 10:32:42 -0400 Subject: [PATCH 2/6] Workflow cleanup and change all instances to 21 Signed-off-by: Derek Ho --- .../cypress-test-multidatasources-enabled-e2e.yml | 3 ++- .github/workflows/cypress-test-tenancy-disabled.yml | 8 ++------ .github/workflows/cypress-test.yml | 8 ++------ .github/workflows/integration-test.yml | 11 ++++------- .github/workflows/verify-binary-installation.yml | 3 ++- 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml b/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml index 162941cf1..31205d65c 100644 --- a/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml +++ b/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml @@ -67,7 +67,7 @@ jobs: download-location: ${{env.PLUGIN_NAME}} - name: Run Opensearch with A Single Plugin - uses: derek-ho/start-opensearch@v4 + uses: derek-ho/start-opensearch@v5 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/opensearch-security.zip" @@ -75,6 +75,7 @@ jobs: admin-password: ${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }} security_config_file: config_custom.yml port: 9202 + jdk-version: 21 - name: Check OpenSearch is running # Verify that the server is operational diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml index d67e478a4..b61a1155d 100644 --- a/.github/workflows/cypress-test-tenancy-disabled.yml +++ b/.github/workflows/cypress-test-tenancy-disabled.yml @@ -22,11 +22,6 @@ jobs: runs-on: ${{ matrix.os }} steps: - - name: Set up JDK - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Checkout Branch uses: actions/checkout@v3 @@ -47,12 +42,13 @@ jobs: download-location: ${{ env.PLUGIN_NAME }} - name: Run Opensearch with security - uses: derek-ho/start-opensearch@v2 + uses: derek-ho/start-opensearch@v5 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/${{ env.PLUGIN_NAME }}.zip" security-enabled: true admin-password: ${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }} + jdk-version: 21 # Configure the Dashboard - name: Configure OpenSearch Dashboards with tenancy disabled diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml index c9a85ac6f..64a5e645a 100644 --- a/.github/workflows/cypress-test.yml +++ b/.github/workflows/cypress-test.yml @@ -22,11 +22,6 @@ jobs: runs-on: ${{ matrix.os }} steps: - - name: Set up JDK - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Checkout Branch uses: actions/checkout@v3 @@ -47,12 +42,13 @@ jobs: download-location: ${{ env.PLUGIN_NAME }} - name: Run Opensearch with security - uses: derek-ho/start-opensearch@v2 + uses: derek-ho/start-opensearch@v5 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/${{ env.PLUGIN_NAME }}.zip" security-enabled: true admin-password: ${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }} + jdk-version: 21 # Configure the Dashboard - name: Configure OpenSearch Dashboards for cypress diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 2126ff1d0..98e225a85 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -20,11 +20,6 @@ jobs: steps: - name: Checkout Branch uses: actions/checkout@v3 - - - name: Set up JDK - uses: actions/setup-java@v1 - with: - java-version: 11 - name: Set env run: | @@ -51,7 +46,7 @@ jobs: plugin-version: ${{ env.PLUGIN_VERSION }} - name: Run Opensearch with A Single Plugin Remote Cluster - uses: derek-ho/start-opensearch@v4 + uses: derek-ho/start-opensearch@v5 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/opensearch-security-${{ env.OPENSEARCH_VERSION }}.zip" @@ -59,6 +54,7 @@ jobs: admin-password: ${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }} security_config_file: ${{ inputs.security_config_file }} port: 9202 + jdk-version: 21 - name: Check OpenSearch remote is running run: | @@ -66,12 +62,13 @@ jobs: shell: bash - name: Run Opensearch with security - uses: derek-ho/start-opensearch@v2 + uses: derek-ho/start-opensearch@v5 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/${{ env.PLUGIN_NAME }}.zip" security-enabled: true admin-password: ${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }} + jdk-version: 21 # https://github.com/actions/runner-images/issues/2840#issuecomment-790492173 - name: Remove unnecessary files Linux diff --git a/.github/workflows/verify-binary-installation.yml b/.github/workflows/verify-binary-installation.yml index c19bc3c81..d793f8ac4 100644 --- a/.github/workflows/verify-binary-installation.yml +++ b/.github/workflows/verify-binary-installation.yml @@ -39,12 +39,13 @@ jobs: download-location: ${{ env.PLUGIN_NAME }} - name: Run Opensearch with security - uses: derek-ho/start-opensearch@v2 + uses: derek-ho/start-opensearch@v5 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/${{ env.PLUGIN_NAME }}.zip" security-enabled: true admin-password: ${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }} + jdk-version: 21 # Configure the Dashboard - name: Configure OpenSearch Dashboards From 86299aebbc656033e7caa4c748ea5a5c380838c0 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 17 Jun 2024 10:45:33 -0400 Subject: [PATCH 3/6] Remove unecessary step Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index 8541d65cb..17237740c 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -19,11 +19,6 @@ inputs: runs: using: "composite" steps: - - name: Set up JDK - uses: actions/setup-java@v1 - with: - java-version: 21 - - name: Set env run: | opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version") From 0709fde1d13b7a5bfe1615b20fae3b760da13ea8 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 19 Jun 2024 10:55:25 -0400 Subject: [PATCH 4/6] Test if action is whats causing windows failures Signed-off-by: Derek Ho --- .github/workflows/integration-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 98e225a85..8994e4523 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -46,7 +46,7 @@ jobs: plugin-version: ${{ env.PLUGIN_VERSION }} - name: Run Opensearch with A Single Plugin Remote Cluster - uses: derek-ho/start-opensearch@v5 + uses: derek-ho/start-opensearch@windows-fix with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/opensearch-security-${{ env.OPENSEARCH_VERSION }}.zip" @@ -62,7 +62,7 @@ jobs: shell: bash - name: Run Opensearch with security - uses: derek-ho/start-opensearch@v5 + uses: derek-ho/start-opensearch@windows-fix with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/${{ env.PLUGIN_NAME }}.zip" From d9fee45517f9fa8e7724fae5f3d8a9e1bb4f7d81 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 19 Jun 2024 11:42:05 -0400 Subject: [PATCH 5/6] Use released version with bug fix Signed-off-by: Derek Ho --- .github/workflows/integration-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 8994e4523..477c3da03 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -46,7 +46,7 @@ jobs: plugin-version: ${{ env.PLUGIN_VERSION }} - name: Run Opensearch with A Single Plugin Remote Cluster - uses: derek-ho/start-opensearch@windows-fix + uses: derek-ho/start-opensearch@v6 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/opensearch-security-${{ env.OPENSEARCH_VERSION }}.zip" @@ -62,7 +62,7 @@ jobs: shell: bash - name: Run Opensearch with security - uses: derek-ho/start-opensearch@windows-fix + uses: derek-ho/start-opensearch@v6 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/${{ env.PLUGIN_NAME }}.zip" From e8aa0594d2445dcc79b63144c56269446ba0f06a Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 19 Jun 2024 11:45:23 -0400 Subject: [PATCH 6/6] Use v6 for all Signed-off-by: Derek Ho --- .github/actions/run-cypress-tests/action.yml | 2 +- .github/workflows/cypress-test-multidatasources-enabled-e2e.yml | 2 +- .github/workflows/cypress-test-tenancy-disabled.yml | 2 +- .github/workflows/cypress-test.yml | 2 +- .github/workflows/verify-binary-installation.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/run-cypress-tests/action.yml b/.github/actions/run-cypress-tests/action.yml index 17237740c..2f8331e66 100644 --- a/.github/actions/run-cypress-tests/action.yml +++ b/.github/actions/run-cypress-tests/action.yml @@ -36,7 +36,7 @@ runs: download-location: ${{ env.PLUGIN_NAME }} - name: Run Opensearch with A Single Plugin - uses: derek-ho/start-opensearch@v5 + uses: derek-ho/start-opensearch@v6 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/opensearch-security.zip" diff --git a/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml b/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml index 31205d65c..252920a7e 100644 --- a/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml +++ b/.github/workflows/cypress-test-multidatasources-enabled-e2e.yml @@ -67,7 +67,7 @@ jobs: download-location: ${{env.PLUGIN_NAME}} - name: Run Opensearch with A Single Plugin - uses: derek-ho/start-opensearch@v5 + uses: derek-ho/start-opensearch@v6 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/opensearch-security.zip" diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml index b61a1155d..07679e790 100644 --- a/.github/workflows/cypress-test-tenancy-disabled.yml +++ b/.github/workflows/cypress-test-tenancy-disabled.yml @@ -42,7 +42,7 @@ jobs: download-location: ${{ env.PLUGIN_NAME }} - name: Run Opensearch with security - uses: derek-ho/start-opensearch@v5 + uses: derek-ho/start-opensearch@v6 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/${{ env.PLUGIN_NAME }}.zip" diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml index 64a5e645a..5698fa03a 100644 --- a/.github/workflows/cypress-test.yml +++ b/.github/workflows/cypress-test.yml @@ -42,7 +42,7 @@ jobs: download-location: ${{ env.PLUGIN_NAME }} - name: Run Opensearch with security - uses: derek-ho/start-opensearch@v5 + uses: derek-ho/start-opensearch@v6 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/${{ env.PLUGIN_NAME }}.zip" diff --git a/.github/workflows/verify-binary-installation.yml b/.github/workflows/verify-binary-installation.yml index d793f8ac4..70c210a8b 100644 --- a/.github/workflows/verify-binary-installation.yml +++ b/.github/workflows/verify-binary-installation.yml @@ -39,7 +39,7 @@ jobs: download-location: ${{ env.PLUGIN_NAME }} - name: Run Opensearch with security - uses: derek-ho/start-opensearch@v5 + uses: derek-ho/start-opensearch@v6 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} plugins: "file:$(pwd)/${{ env.PLUGIN_NAME }}.zip"