From e1e34ea0e05151526cf45a400a23de07a7f00c4a Mon Sep 17 00:00:00 2001
From: David Gamez <1192523+davidgamez@users.noreply.github.com>
Date: Thu, 9 Jan 2025 11:23:31 -0500
Subject: [PATCH] chore: upgrade missed e2e upload artifact to v4 (#1937)

---
 .github/workflows/acceptance_test.yml | 16 ++++++++--------
 .github/workflows/end_to_end.yml      | 18 ++++++++++++++++--
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/acceptance_test.yml b/.github/workflows/acceptance_test.yml
index 4759f4172e..d279b38ecf 100644
--- a/.github/workflows/acceptance_test.yml
+++ b/.github/workflows/acceptance_test.yml
@@ -22,14 +22,14 @@ concurrency:
 jobs:
   fail_if_pull_request_is_draft: # Fails in order to indicate that pull request needs to be marked as ready to review to pass.
     if: github.event.pull_request.draft == true
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Fail if PR is a draft
         run: exit 1
   pre_ci:
     name: Prepare CI environment
     if: github.event.pull_request.draft == false # Skip this job and its dependencies if the PR is draft
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout Project
         uses: actions/checkout@v4
@@ -53,13 +53,13 @@ jobs:
   validate-gradle-wrapper:
     if: "!contains(needs.pre_ci.outputs.commit_message, '[acceptance test skip]')"
     needs: pre_ci
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: gradle/actions/wrapper-validation@v3
   pack-snapshot:
     needs: [ validate-gradle-wrapper ]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 11
@@ -89,7 +89,7 @@ jobs:
           path: output-comparator/build/libs/output-comparator-*-cli.jar
   pack-master:
     needs: [ validate-gradle-wrapper ]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -117,7 +117,7 @@ jobs:
   fetch-urls:
     if: "!contains(needs.pre_ci.outputs.commit_message, '[acceptance test skip]')"
     needs: pre_ci
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository code
         uses: actions/checkout@v4
@@ -174,7 +174,7 @@ jobs:
           name: reports_${{ env.CONCATENATED_IDS }}
           path: ${{ github.sha }}/output
   merge-reports-artifacts:
-     runs-on: ubuntu-latest
+     runs-on: ubuntu-22.04
      needs: [ get-reports ]
      steps:
        - name: Merge Artifacts
@@ -185,7 +185,7 @@ jobs:
            delete-merged: true
   compare-outputs:
     needs: [ merge-reports-artifacts ]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Download comparator .jar file from previous job
diff --git a/.github/workflows/end_to_end.yml b/.github/workflows/end_to_end.yml
index e40141ecfb..fcb5624190 100644
--- a/.github/workflows/end_to_end.yml
+++ b/.github/workflows/end_to_end.yml
@@ -31,6 +31,7 @@ on:
       - 'acceptance_test.yml'
       - 'web/**'
       - '.github/workflows/**'
+  workflow_dispatch:
 jobs:
   validate_gradle_wrapper:
     runs-on: ubuntu-latest
@@ -104,8 +105,21 @@ jobs:
           bash ./scripts/queue_runner.sh --exclude-master $queue
         env:
           OUTPUT_BASE: ${{ github.sha }}
+      - name: Extract ID from JSON
+        id: extract-id
+        run: echo "feed_id=$(echo '${{ matrix.data }}' | jq -r '.id')" >> $GITHUB_ENV
       - name: Persist reports
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: reports_snapshot
+          name: reports_snapshot_${{ env.feed_id }}
           path: ${{ github.sha }}/output
+  merge-reports-artifacts:
+    runs-on: ubuntu-latest
+    needs: [ run-on-data ]
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: reports_snapshot
+          pattern: reports_snapshot_*
+          delete-merged: true