From 69da562e95036836f086c355037c0e4628e8e2f6 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 09:05:25 -0300 Subject: [PATCH 01/25] Update GitHub Actions to use checkout@v4 for consistency and improved functionality across workflows --- .github/workflows/cypress-e2e-reporting-test.yml | 4 ++-- .../dashboards-reports-test-and-build-workflow.yml | 12 ++++++------ .github/workflows/dev-environment.yml | 2 +- .github/workflows/ftr-e2e-reporting-test.yml | 6 +++--- .github/workflows/link-checker.yml | 2 +- .github/workflows/lint.yml | 4 ++-- .github/workflows/verify-binary-installation.yml | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index c7e30536..239a59e7 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -79,7 +79,7 @@ jobs: shell: bash - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards @@ -90,7 +90,7 @@ jobs: test - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index d5971cd2..0537d958 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -27,14 +27,14 @@ jobs: steps: - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: opensearch-project/Opensearch-Dashboards ref: ${{ env.OPENSEARCH_VERSION }} path: OpenSearch-Dashboards - name: Checkout Plugin - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} @@ -81,7 +81,7 @@ jobs: # run: git config --system core.longpaths true # - name: Checkout OpenSearch Dashboards - # uses: actions/checkout@v1 + # uses: actions/checkout@v4 # with: # repository: opensearch-project/Opensearch-Dashboards # ref: ${{ env.OPENSEARCH_VERSION }} @@ -105,7 +105,7 @@ jobs: # - run: yarn -v # - name: Checkout Plugin - # uses: actions/checkout@v1 + # uses: actions/checkout@v4 # with: # path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} @@ -138,7 +138,7 @@ jobs: # runs-on: macos-latest # steps: # - name: Checkout OpenSearch Dashboards - # uses: actions/checkout@v1 + # uses: actions/checkout@v4 # with: # repository: opensearch-project/Opensearch-Dashboards # ref: ${{ env.OPENSEARCH_VERSION }} @@ -162,7 +162,7 @@ jobs: # - run: yarn -v # - name: Checkout Plugin - # uses: actions/checkout@v1 + # uses: actions/checkout@v4 # with: # path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} diff --git a/.github/workflows/dev-environment.yml b/.github/workflows/dev-environment.yml index 471c633c..99672634 100644 --- a/.github/workflows/dev-environment.yml +++ b/.github/workflows/dev-environment.yml @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Step 01 - Download the plugin's source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: wazuh/wazuh-dashboards-reporting ref: ${{ inputs.reference }} diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 26055434..4a1c823d 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -79,7 +79,7 @@ jobs: shell: bash - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards @@ -90,7 +90,7 @@ jobs: test - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} @@ -137,7 +137,7 @@ jobs: working-directory: OpenSearch-Dashboards - name: Checkout Dashboards Functioanl Test Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: opensearch-dashboards-functional-test repository: opensearch-project/opensearch-dashboards-functional-test diff --git a/.github/workflows/link-checker.yml b/.github/workflows/link-checker.yml index b50f79bf..7a25a666 100644 --- a/.github/workflows/link-checker.yml +++ b/.github/workflows/link-checker.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: lychee Link Checker id: lychee uses: lycheeverse/lychee-action@master diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 02e8bb0f..4ccf3d3a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,14 +13,14 @@ jobs: steps: - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: opensearch-project/Opensearch-Dashboards ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} path: OpenSearch-Dashboards - name: Checkout dashboards reporting - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} fetch-depth: 0 diff --git a/.github/workflows/verify-binary-installation.yml b/.github/workflows/verify-binary-installation.yml index b4da9c92..e12cad21 100644 --- a/.github/workflows/verify-binary-installation.yml +++ b/.github/workflows/verify-binary-installation.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout Branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set env run: | From 8a18c2cdc5acc2bd98c20647f33df1cf53a3cb3c Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 09:23:02 -0300 Subject: [PATCH 02/25] Downgrade actions/checkout from v4 to v3 for consistent versioning across Cypress and FTR workflows --- .github/workflows/cypress-e2e-reporting-test.yml | 4 ++-- .github/workflows/ftr-e2e-reporting-test.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 239a59e7..a9b086a2 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -79,7 +79,7 @@ jobs: shell: bash - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards @@ -90,7 +90,7 @@ jobs: test - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 4a1c823d..e665cc1b 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -79,7 +79,7 @@ jobs: shell: bash - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards @@ -90,7 +90,7 @@ jobs: test - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} @@ -137,7 +137,7 @@ jobs: working-directory: OpenSearch-Dashboards - name: Checkout Dashboards Functioanl Test Repo - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: path: opensearch-dashboards-functional-test repository: opensearch-project/opensearch-dashboards-functional-test From f20ad50168caeea58dad88b1f8a77872dbee0f04 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 09:35:32 -0300 Subject: [PATCH 03/25] Update actions/checkout to v4 in workflows --- .github/workflows/cypress-e2e-reporting-test.yml | 6 +++--- .github/workflows/ftr-e2e-reporting-test.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index a9b086a2..4e098d6a 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -79,18 +79,18 @@ jobs: shell: bash - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} fetch-depth: 0 - filter: | + sparse-checkout: | cypress test - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index e665cc1b..818eb0f9 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -79,18 +79,18 @@ jobs: shell: bash - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} fetch-depth: 0 - filter: | + sparse-checkout: | cypress test - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} @@ -137,7 +137,7 @@ jobs: working-directory: OpenSearch-Dashboards - name: Checkout Dashboards Functioanl Test Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: opensearch-dashboards-functional-test repository: opensearch-project/opensearch-dashboards-functional-test From 10635c60322637d9f85c4956d8d143c5e0ac8e55 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 09:53:55 -0300 Subject: [PATCH 04/25] Downgrade actions/checkout from v4 to v3 in Cypress and FTR workflows for consistent versioning and setup --- .github/workflows/cypress-e2e-reporting-test.yml | 4 ++-- .github/workflows/ftr-e2e-reporting-test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 4e098d6a..e1c28ff4 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -79,13 +79,13 @@ jobs: shell: bash - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} fetch-depth: 0 - sparse-checkout: | + filter: | cypress test diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 818eb0f9..af81924c 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -79,13 +79,13 @@ jobs: shell: bash - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} fetch-depth: 0 - sparse-checkout: | + filter: | cypress test From 3bf610ed2bb2895438e4eaea8053a8596f6b9327 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 10:00:31 -0300 Subject: [PATCH 05/25] Update actions/upload-artifact to v4 and enable overwrite for GitHub artifact uploads --- .github/workflows/dev-environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev-environment.yml b/.github/workflows/dev-environment.yml index 99672634..c5974a77 100644 --- a/.github/workflows/dev-environment.yml +++ b/.github/workflows/dev-environment.yml @@ -82,10 +82,11 @@ jobs: - name: Step 04 - Upload artifact to GitHub if: ${{ inputs.artifact_name && inputs.artifact_path }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ inputs.artifact_name }}_${{ env.version }}-${{ env.revision }}_${{ inputs.reference }}.zip path: ${{ inputs.artifact_path }} + overwrite: true - name: Step 05 - Upload coverage results to GitHub if: ${{ inputs.notify_jest_coverage_summary && github.event_name == 'pull_request' }} From 5996dd247156426552212143e81acaeb083ae420 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 10:01:52 -0300 Subject: [PATCH 06/25] Update actions/setup-node to v4 across all workflows to ensure consistency and benefit from latest features --- .github/workflows/cypress-e2e-reporting-test.yml | 2 +- .../workflows/dashboards-reports-test-and-build-workflow.yml | 4 ++-- .github/workflows/ftr-e2e-reporting-test.yml | 2 +- .github/workflows/lint.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index e1c28ff4..1ce72442 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -101,7 +101,7 @@ jobs: working-directory: OpenSearch-Dashboards shell: bash - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: ${{ steps.tool-versions.outputs.node_version }} registry-url: 'https://registry.npmjs.org' diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 0537d958..67a4fb0f 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -88,7 +88,7 @@ jobs: # path: OpenSearch-Dashboards # - name: Setup Node - # uses: actions/setup-node@v3 + # uses: actions/setup-node@v4 # with: # node-version-file: '../OpenSearch-Dashboards/.nvmrc' # registry-url: 'https://registry.npmjs.org' @@ -145,7 +145,7 @@ jobs: # path: OpenSearch-Dashboards # - name: Setup Node - # uses: actions/setup-node@v3 + # uses: actions/setup-node@v4 # with: # node-version-file: '../OpenSearch-Dashboards/.nvmrc' # registry-url: 'https://registry.npmjs.org' diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index af81924c..5d7d000e 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -101,7 +101,7 @@ jobs: working-directory: OpenSearch-Dashboards shell: bash - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: ${{ steps.tool-versions.outputs.node_version }} registry-url: 'https://registry.npmjs.org' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4ccf3d3a..037915a9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -33,7 +33,7 @@ jobs: echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")" - name: Setup node - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ steps.versions_step.outputs.node_version }} registry-url: "https://registry.npmjs.org" From 0bb925f2bec2af4ed84ae88fc5732075678b3d9e Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 10:36:05 -0300 Subject: [PATCH 07/25] Update tibdex/github-app-token to v2.1.0 and adjust installation retrieval settings for improved flexibility in workflows --- .github/workflows/backport.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 6472a968..45be3b06 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -16,11 +16,14 @@ jobs: steps: - name: GitHub App token id: github_app_token - uses: tibdex/github-app-token@v1.5.0 + uses: tibdex/github-app-token@v2.1.0 with: app_id: ${{ secrets.APP_ID }} private_key: ${{ secrets.APP_PRIVATE_KEY }} - installation_id: 22958780 + # https://github.com/tibdex/github-app-token/releases/tag/v2.0.0 + # https://github.com/tibdex/github-app-token/compare/v1.5.0...v2.1.0#diff-1243c5424efaaa19bd8e813c5e6f6da46316e63761421b3e5f5c8ced9a36e6b6R11-R30 + installation_retrieval_mode: id + installation_retrieval_payload: 22958780 - name: Backport uses: VachaShah/backport@v2.2.0 From 276d054a7c07d9c68d7b011b1baf164665daf725 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 10:56:34 -0300 Subject: [PATCH 08/25] Update actions/setup-java to v4 in cypress and ftr workflows for consistency and access to latest improvements --- .github/workflows/cypress-e2e-reporting-test.yml | 2 +- .github/workflows/ftr-e2e-reporting-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 1ce72442..26e8921e 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.jdk }} diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 5d7d000e..62ce935b 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.jdk }} From 46bd9c4d763996cac98f757983d9afa28be0875c Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 10:58:23 -0300 Subject: [PATCH 09/25] Update suisei-cn/actions-download-file to v1.6.0 in cypress and ftr workflows for consistent artifact management --- .github/workflows/cypress-e2e-reporting-test.yml | 4 ++-- .github/workflows/ftr-e2e-reporting-test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 26e8921e..1f440eea 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -28,14 +28,14 @@ jobs: java-version: ${{ matrix.jdk }} - name: Download Job Scheduler artifact - uses: suisei-cn/actions-download-file@v1.4.0 + uses: suisei-cn/actions-download-file@v1.6.0 with: url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip target: plugin-artifacts/ filename: job-scheduler.zip - name: Download Reports Scheduler artifact - uses: suisei-cn/actions-download-file@v1.4.0 + uses: suisei-cn/actions-download-file@v1.6.0 with: url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip target: plugin-artifacts/ diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 62ce935b..23f27d03 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -28,14 +28,14 @@ jobs: java-version: ${{ matrix.jdk }} - name: Download Job Scheduler artifact - uses: suisei-cn/actions-download-file@v1.4.0 + uses: suisei-cn/actions-download-file@v1.6.0 with: url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip target: plugin-artifacts/ filename: job-scheduler.zip - name: Download Reports Scheduler artifact - uses: suisei-cn/actions-download-file@v1.4.0 + uses: suisei-cn/actions-download-file@v1.6.0 with: url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip target: plugin-artifacts/ From 9ef39f12cae647b937425c1e44ca37a3eb920f14 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 11:03:50 -0300 Subject: [PATCH 10/25] Add 'temurin' distribution to JDK setup in cypress and ftr workflows for improved consistency --- .github/workflows/cypress-e2e-reporting-test.yml | 1 + .github/workflows/ftr-e2e-reporting-test.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 1f440eea..4faeb13c 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -25,6 +25,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: + distribution: 'temurin' java-version: ${{ matrix.jdk }} - name: Download Job Scheduler artifact diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 23f27d03..cbcd05d0 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -25,6 +25,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: + distribution: 'temurin' java-version: ${{ matrix.jdk }} - name: Download Job Scheduler artifact From 0dd41b5191bca121f9211736e7f46294206d89b2 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 11:08:13 -0300 Subject: [PATCH 11/25] Upgrade download-file action to v3 in cypress and ftr workflows for enhanced performance and consistency --- .github/workflows/cypress-e2e-reporting-test.yml | 2 +- .github/workflows/ftr-e2e-reporting-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 4faeb13c..f4e978c3 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -43,7 +43,7 @@ jobs: filename: reports-scheduler.zip - name: Download OpenSearch - uses: peternied/download-file@v2 + uses: peternied/download-file@v3 with: url: https://artifacts.opensearch.org/snapshots/core/opensearch/${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/opensearch-min-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT-linux-x64-latest.tar.gz diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index cbcd05d0..5f270bc3 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -43,7 +43,7 @@ jobs: filename: reports-scheduler.zip - name: Download OpenSearch - uses: peternied/download-file@v2 + uses: peternied/download-file@v3 with: url: https://artifacts.opensearch.org/snapshots/core/opensearch/${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/opensearch-min-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT-linux-x64-latest.tar.gz From 4962112f3973e7d75b8e5313a5f108c7ae64b8fd Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 11:14:58 -0300 Subject: [PATCH 12/25] Replace download-file action with wget command in cypress and ftr workflows for improved reliability in OpenSearch download --- .github/workflows/cypress-e2e-reporting-test.yml | 6 +++--- .github/workflows/ftr-e2e-reporting-test.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index f4e978c3..55388147 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -43,9 +43,9 @@ jobs: filename: reports-scheduler.zip - name: Download OpenSearch - uses: peternied/download-file@v3 - with: - url: https://artifacts.opensearch.org/snapshots/core/opensearch/${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/opensearch-min-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT-linux-x64-latest.tar.gz + run: | + wget 'https://artifacts.opensearch.org/snapshots/core/opensearch/${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/opensearch-min-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT-linux-x64-latest.tar.gz' --retry-connrefused --tries=3 --no-dns-cache --progress=bar:force:noscroll --verbose + shell: bash - name: Extract OpenSearch run: | diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 5f270bc3..b4e35ad4 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -43,9 +43,9 @@ jobs: filename: reports-scheduler.zip - name: Download OpenSearch - uses: peternied/download-file@v3 - with: - url: https://artifacts.opensearch.org/snapshots/core/opensearch/${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/opensearch-min-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT-linux-x64-latest.tar.gz + run: | + wget 'https://artifacts.opensearch.org/snapshots/core/opensearch/${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/opensearch-min-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT-linux-x64-latest.tar.gz' --retry-connrefused --tries=3 --no-dns-cache --progress=bar:force:noscroll --verbose + shell: bash - name: Extract OpenSearch run: | From ad96808067ff07266e4a53ae3559a0f8d491cb0f Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 11:28:21 -0300 Subject: [PATCH 13/25] Replace download-file action with wget command in cypress workflow for improved reliability in OpenSearch artifact downloads --- .github/workflows/cypress-e2e-reporting-test.yml | 16 ++++++---------- .github/workflows/ftr-e2e-reporting-test.yml | 16 ++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 55388147..dda750be 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -29,18 +29,14 @@ jobs: java-version: ${{ matrix.jdk }} - name: Download Job Scheduler artifact - uses: suisei-cn/actions-download-file@v1.6.0 - with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip - target: plugin-artifacts/ - filename: job-scheduler.zip + run: | + wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + shell: bash - name: Download Reports Scheduler artifact - uses: suisei-cn/actions-download-file@v1.6.0 - with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip - target: plugin-artifacts/ - filename: reports-scheduler.zip + run: | + wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + shell: bash - name: Download OpenSearch run: | diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index b4e35ad4..2bd042a1 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -29,18 +29,14 @@ jobs: java-version: ${{ matrix.jdk }} - name: Download Job Scheduler artifact - uses: suisei-cn/actions-download-file@v1.6.0 - with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip - target: plugin-artifacts/ - filename: job-scheduler.zip + run: | + wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + shell: bash - name: Download Reports Scheduler artifact - uses: suisei-cn/actions-download-file@v1.6.0 - with: - url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip - target: plugin-artifacts/ - filename: reports-scheduler.zip + run: | + wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + shell: bash - name: Download OpenSearch run: | From 45e9fe39222df90def36372e890c394516f7a63b Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 11:38:05 -0300 Subject: [PATCH 14/25] Check for existing files before downloading OpenSearch artifacts in cypress and ftr workflows to avoid redundant downloads --- .github/workflows/cypress-e2e-reporting-test.yml | 14 ++++++++++++-- .github/workflows/ftr-e2e-reporting-test.yml | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index dda750be..96242bb3 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -30,12 +30,22 @@ jobs: - name: Download Job Scheduler artifact run: | - wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + if [ ! -f "plugin-artifacts/job-scheduler.zip" ]; then + mkdir -p plugin-artifacts + wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + else + echo "File already exists. Skipping download." + fi shell: bash - name: Download Reports Scheduler artifact run: | - wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + if [ ! -f "plugin-artifacts/reports-scheduler.zip" ]; then + mkdir -p plugin-artifacts + wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + else + echo "File already exists. Skipping download." + fi shell: bash - name: Download OpenSearch diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 2bd042a1..f1a494b0 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -30,12 +30,22 @@ jobs: - name: Download Job Scheduler artifact run: | - wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + if [ ! -f "plugin-artifacts/job-scheduler.zip" ]; then + mkdir -p plugin-artifacts + wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + else + echo "File already exists. Skipping download." + fi shell: bash - name: Download Reports Scheduler artifact run: | - wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + if [ ! -f "plugin-artifacts/reports-scheduler.zip" ]; then + mkdir -p plugin-artifacts + wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" + else + echo "File already exists. Skipping download." + fi shell: bash - name: Download OpenSearch From a51b415edddd2152ecfb7809a379b97327d847d0 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 11:41:10 -0300 Subject: [PATCH 15/25] Adjust existence check to directories instead of files for downloading OpenSearch artifacts in cypress and ftr workflows --- .github/workflows/cypress-e2e-reporting-test.yml | 8 ++++---- .github/workflows/ftr-e2e-reporting-test.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 96242bb3..f0cc9204 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -30,21 +30,21 @@ jobs: - name: Download Job Scheduler artifact run: | - if [ ! -f "plugin-artifacts/job-scheduler.zip" ]; then + if [ ! -d "plugin-artifacts" ]; then mkdir -p plugin-artifacts wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" else - echo "File already exists. Skipping download." + echo "Folder already exists. Skipping download." fi shell: bash - name: Download Reports Scheduler artifact run: | - if [ ! -f "plugin-artifacts/reports-scheduler.zip" ]; then + if [ ! -d "plugin-artifacts" ]; then mkdir -p plugin-artifacts wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" else - echo "File already exists. Skipping download." + echo "Folder already exists. Skipping download." fi shell: bash diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index f1a494b0..1bae4bdd 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -30,21 +30,21 @@ jobs: - name: Download Job Scheduler artifact run: | - if [ ! -f "plugin-artifacts/job-scheduler.zip" ]; then + if [ ! -d "plugin-artifacts" ]; then mkdir -p plugin-artifacts wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" else - echo "File already exists. Skipping download." + echo "Folder already exists. Skipping download." fi shell: bash - name: Download Reports Scheduler artifact run: | - if [ ! -f "plugin-artifacts/reports-scheduler.zip" ]; then + if [ ! -d "plugin-artifacts" ]; then mkdir -p plugin-artifacts wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" else - echo "File already exists. Skipping download." + echo "Folder already exists. Skipping download." fi shell: bash From 61c281c721aeaabcb4d53a6a499d6b4aa263797c Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 11:43:21 -0300 Subject: [PATCH 16/25] Refactor artifact download logic to ensure consistent execution in cypress and ftr workflows by removing existence checks --- .github/workflows/cypress-e2e-reporting-test.yml | 8 ++------ .github/workflows/ftr-e2e-reporting-test.yml | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index f0cc9204..590ea5c1 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -32,20 +32,16 @@ jobs: run: | if [ ! -d "plugin-artifacts" ]; then mkdir -p plugin-artifacts - wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" - else - echo "Folder already exists. Skipping download." fi + wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" shell: bash - name: Download Reports Scheduler artifact run: | if [ ! -d "plugin-artifacts" ]; then mkdir -p plugin-artifacts - wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" - else - echo "Folder already exists. Skipping download." fi + wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" shell: bash - name: Download OpenSearch diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index 1bae4bdd..aae0eddf 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -32,20 +32,16 @@ jobs: run: | if [ ! -d "plugin-artifacts" ]; then mkdir -p plugin-artifacts - wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" - else - echo "Folder already exists. Skipping download." fi + wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" shell: bash - name: Download Reports Scheduler artifact run: | if [ ! -d "plugin-artifacts" ]; then mkdir -p plugin-artifacts - wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" - else - echo "Folder already exists. Skipping download." fi + wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" shell: bash - name: Download OpenSearch From 4271b8bd3484d6317f8b87e11cd49635ade537b3 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 11:51:59 -0300 Subject: [PATCH 17/25] Update retry action version to v2.9.0 for OpenSearch Dashboards plugin bootstrap and test in workflows --- .../dashboards-reports-test-and-build-workflow.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 67a4fb0f..ad290265 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -39,7 +39,7 @@ jobs: path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - name: OpenSearch Dashboards Plugin Bootstrap and test - uses: nick-fields/retry@v1 + uses: nick-fields/retry@v2.9.0 with: timeout_minutes: 30 max_attempts: 3 @@ -110,14 +110,14 @@ jobs: # path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} # - name: OpenSearch Dashboards Plugin Bootstrap - # uses: nick-fields/retry@v1 + # uses: nick-fields/retry@@v2.9.0 # with: # timeout_minutes: 30 # max_attempts: 3 # command: yarn osd bootstrap --single-version=loose # - name: Test - # uses: nick-fields/retry@v1 + # uses: nick-fields/retry@@v2.9.0 # with: # timeout_minutes: 30 # max_attempts: 3 @@ -167,14 +167,14 @@ jobs: # path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} # - name: OpenSearch Dashboards Plugin Bootstrap - # uses: nick-fields/retry@v1 + # uses: nick-fields/retry@@v2.9.0 # with: # timeout_minutes: 30 # max_attempts: 3 # command: yarn osd bootstrap --single-version=loose # - name: Test - # uses: nick-fields/retry@v1 + # uses: nick-fields/retry@@v2.9.0 # with: # timeout_minutes: 30 # max_attempts: 3 From 845727e3fd9951cd94781493ae4bfcc07cc5af04 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 11:52:34 -0300 Subject: [PATCH 18/25] Fix retry action reference in workflows to use single '@' for v2.9.0 in dashboards reports test and build workflow --- .../dashboards-reports-test-and-build-workflow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index ad290265..c4b1df9c 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -110,14 +110,14 @@ jobs: # path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} # - name: OpenSearch Dashboards Plugin Bootstrap - # uses: nick-fields/retry@@v2.9.0 + # uses: nick-fields/retry@v2.9.0 # with: # timeout_minutes: 30 # max_attempts: 3 # command: yarn osd bootstrap --single-version=loose # - name: Test - # uses: nick-fields/retry@@v2.9.0 + # uses: nick-fields/retry@v2.9.0 # with: # timeout_minutes: 30 # max_attempts: 3 @@ -167,14 +167,14 @@ jobs: # path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} # - name: OpenSearch Dashboards Plugin Bootstrap - # uses: nick-fields/retry@@v2.9.0 + # uses: nick-fields/retry@v2.9.0 # with: # timeout_minutes: 30 # max_attempts: 3 # command: yarn osd bootstrap --single-version=loose # - name: Test - # uses: nick-fields/retry@@v2.9.0 + # uses: nick-fields/retry@v2.9.0 # with: # timeout_minutes: 30 # max_attempts: 3 From c77a1831a89ab687ca425c38b92299b8779e6b80 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 12:04:26 -0300 Subject: [PATCH 19/25] Update codecov action version to v4.6.0 for improved coverage reporting in dashboards reports test and build workflow --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index c4b1df9c..f22acbec 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -51,7 +51,7 @@ jobs: whoami && yarn osd bootstrap --single-version=loose && yarn test --coverage" - name: Upload coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4.6.0 with: flags: dashboards-report directory: ./OpenSearch-Dashboards/plugins/ From e507e517876d1f8bd646d9135275ab9fb8817907 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 12:09:56 -0300 Subject: [PATCH 20/25] Streamline mkdir usage in workflows by removing redundant checks for plugin-artifacts directory creation --- .github/workflows/cypress-e2e-reporting-test.yml | 8 ++------ .github/workflows/ftr-e2e-reporting-test.yml | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 590ea5c1..0e10c2cb 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -30,17 +30,13 @@ jobs: - name: Download Job Scheduler artifact run: | - if [ ! -d "plugin-artifacts" ]; then - mkdir -p plugin-artifacts - fi + mkdir -p plugin-artifacts wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" shell: bash - name: Download Reports Scheduler artifact run: | - if [ ! -d "plugin-artifacts" ]; then - mkdir -p plugin-artifacts - fi + mkdir -p plugin-artifacts wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" shell: bash diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index aae0eddf..a906722e 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -30,17 +30,13 @@ jobs: - name: Download Job Scheduler artifact run: | - if [ ! -d "plugin-artifacts" ]; then - mkdir -p plugin-artifacts - fi + mkdir -p plugin-artifacts wget -O plugin-artifacts/job-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" shell: bash - name: Download Reports Scheduler artifact run: | - if [ ! -d "plugin-artifacts" ]; then - mkdir -p plugin-artifacts - fi + mkdir -p plugin-artifacts wget -O plugin-artifacts/reports-scheduler.zip "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip" shell: bash From ea32ba23b223035e3bc0562122a565162585a3ba Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 12:22:06 -0300 Subject: [PATCH 21/25] Downgrade codecov action to v3 to address compatibility issues in dashboards reports test and build workflow --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index f22acbec..8ef3f540 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -51,7 +51,7 @@ jobs: whoami && yarn osd bootstrap --single-version=loose && yarn test --coverage" - name: Upload coverage - uses: codecov/codecov-action@v4.6.0 + uses: codecov/codecov-action@v3 with: flags: dashboards-report directory: ./OpenSearch-Dashboards/plugins/ From e8ca3854b95c202779a9f967427c48c3008ae62c Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 12:32:28 -0300 Subject: [PATCH 22/25] Upgrade release-drafter action to v6 for better draft release notes handling in workflows --- .github/workflows/draft-release-notes-workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml index e33df5ca..55f74aaf 100644 --- a/.github/workflows/draft-release-notes-workflow.yml +++ b/.github/workflows/draft-release-notes-workflow.yml @@ -12,7 +12,8 @@ jobs: steps: # Drafts your next Release notes as Pull Requests are merged into "main" - name: Update draft release notes - uses: release-drafter/release-drafter@v5 + # https://github.com/release-drafter/release-drafter/compare/v5.25.0...v6.0.0 + uses: release-drafter/release-drafter@v6 with: config-name: draft-release-notes-config.yml tag: (None) From c9aba27e60c3cec1d77903752c56991a17915926 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 12:34:15 -0300 Subject: [PATCH 23/25] Upgrade start-opensearch action to v6 for enhanced functionality in binary installation verification workflow --- .github/workflows/verify-binary-installation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-binary-installation.yml b/.github/workflows/verify-binary-installation.yml index e12cad21..5f786d27 100644 --- a/.github/workflows/verify-binary-installation.yml +++ b/.github/workflows/verify-binary-installation.yml @@ -29,7 +29,7 @@ jobs: shell: bash - name: Run Opensearch - uses: derek-ho/start-opensearch@v2 + uses: derek-ho/start-opensearch@v6 with: opensearch-version: ${{ env.OPENSEARCH_VERSION }} security-enabled: false From d7431d688bacbd008b2e269680401eac9a9f8768 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 12:34:18 -0300 Subject: [PATCH 24/25] Upgrade setup-opensearch-dashboards action to v3 for improved dashboard setup in binary installation verification workflow --- .github/workflows/verify-binary-installation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-binary-installation.yml b/.github/workflows/verify-binary-installation.yml index 5f786d27..5e26922b 100644 --- a/.github/workflows/verify-binary-installation.yml +++ b/.github/workflows/verify-binary-installation.yml @@ -36,7 +36,7 @@ jobs: - name: Run Dashboard id: setup-dashboards - uses: derek-ho/setup-opensearch-dashboards@v2 + uses: derek-ho/setup-opensearch-dashboards@v3 with: plugin_name: dashboards-reporting built_plugin_name: reportsDashboards From 5ff69e45b00e67d883b124ace61d06bf8bbb2a51 Mon Sep 17 00:00:00 2001 From: Guido Modarelli Date: Thu, 7 Nov 2024 12:45:17 -0300 Subject: [PATCH 25/25] Upgrade actions/checkout to v4 for enhanced functionality in Cypress and FTR E2E reporting test workflows --- .github/workflows/cypress-e2e-reporting-test.yml | 5 +---- .github/workflows/ftr-e2e-reporting-test.yml | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cypress-e2e-reporting-test.yml b/.github/workflows/cypress-e2e-reporting-test.yml index 0e10c2cb..6abc5f1a 100644 --- a/.github/workflows/cypress-e2e-reporting-test.yml +++ b/.github/workflows/cypress-e2e-reporting-test.yml @@ -78,15 +78,12 @@ jobs: shell: bash - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} fetch-depth: 0 - filter: | - cypress - test - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir uses: actions/checkout@v4 diff --git a/.github/workflows/ftr-e2e-reporting-test.yml b/.github/workflows/ftr-e2e-reporting-test.yml index a906722e..d06ed2a7 100644 --- a/.github/workflows/ftr-e2e-reporting-test.yml +++ b/.github/workflows/ftr-e2e-reporting-test.yml @@ -78,15 +78,12 @@ jobs: shell: bash - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }} fetch-depth: 0 - filter: | - cypress - test - name: Checkout Dashboards Reporting Plugin in OpenSearch Dashboards Plugins Dir uses: actions/checkout@v4