From 259fc418f881f45e1310bd44ba5c705e15a538e0 Mon Sep 17 00:00:00 2001
From: strtgbb <146047128+strtgbb@users.noreply.github.com>
Date: Thu, 18 Sep 2025 09:08:50 -0400
Subject: [PATCH 1/6] update grype path

---
 .../create_workflow_report.py                 | 24 +++++++++++++++----
 .../grype/transform_and_upload_results_s3.sh  | 10 ++++++--
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/.github/actions/create_workflow_report/create_workflow_report.py b/.github/actions/create_workflow_report/create_workflow_report.py
index 7286e54eb115..15cc8ee1eb63 100755
--- a/.github/actions/create_workflow_report/create_workflow_report.py
+++ b/.github/actions/create_workflow_report/create_workflow_report.py
@@ -386,7 +386,7 @@ def get_cached_job(job_name: str) -> dict:
     return workflow_config["cache_jobs"].get(job_name, {})
 
 
-def get_cves(pr_number, commit_sha):
+def get_cves(pr_number, commit_sha, branch):
     """
     Fetch Grype results from S3.
 
@@ -395,19 +395,33 @@ def get_cves(pr_number, commit_sha):
     s3_client = boto3.client("s3", endpoint_url=os.getenv("S3_URL"))
     prefixes_to_check = set()
 
+    def format_prefix(pr_number, commit_sha, branch):
+        if pr_number == 0:
+            return f"REFs/{branch}/{commit_sha}/grype/"
+        else:
+            return f"PRs/{pr_number}/{commit_sha}/grype/"
+
     cached_server_job = get_cached_job("Docker server image")
     if cached_server_job:
         prefixes_to_check.add(
-            f"{cached_server_job['pr_number']}/{cached_server_job['sha']}/grype/"
+            format_prefix(
+                cached_server_job["pr_number"],
+                cached_server_job["sha"],
+                cached_server_job["branch"],
+            )
         )
     cached_keeper_job = get_cached_job("Docker keeper image")
     if cached_keeper_job:
         prefixes_to_check.add(
-            f"{cached_keeper_job['pr_number']}/{cached_keeper_job['sha']}/grype/"
+            format_prefix(
+                cached_keeper_job["pr_number"],
+                cached_keeper_job["sha"],
+                cached_keeper_job["branch"],
+            )
         )
 
     if not prefixes_to_check:
-        prefixes_to_check = {f"{pr_number}/{commit_sha}/grype/"}
+        prefixes_to_check = {format_prefix(pr_number, commit_sha, branch)}
 
     grype_result_dirs = []
     for s3_prefix in prefixes_to_check:
@@ -690,7 +704,7 @@ def create_workflow_report(
         "checks_errors": get_checks_errors(db_client, commit_sha, branch_name),
         "regression_fails": get_regression_fails(db_client, actions_run_url),
         "docker_images_cves": (
-            [] if not check_cves else get_cves(pr_number, commit_sha)
+            [] if not check_cves else get_cves(pr_number, commit_sha, branch_name)
         ),
     }
 
diff --git a/.github/grype/transform_and_upload_results_s3.sh b/.github/grype/transform_and_upload_results_s3.sh
index 7a10b02887ef..fcb9379a325a 100755
--- a/.github/grype/transform_and_upload_results_s3.sh
+++ b/.github/grype/transform_and_upload_results_s3.sh
@@ -1,7 +1,13 @@
 DOCKER_IMAGE=$(echo "$DOCKER_IMAGE" | sed 's/[\/:]/_/g')
 
-S3_PATH="s3://$S3_BUCKET/$PR_NUMBER/$COMMIT_SHA/grype/$DOCKER_IMAGE"
-HTTPS_S3_PATH="https://s3.amazonaws.com/$S3_BUCKET/$PR_NUMBER/$COMMIT_SHA/grype/$DOCKER_IMAGE"
+if [ "$PR_NUMBER" -eq 0 ]; then
+    PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+else
+    PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+fi
+
+S3_PATH="s3://$S3_BUCKET/$PREFIX/grype/$DOCKER_IMAGE"
+HTTPS_S3_PATH="https://s3.amazonaws.com/$S3_BUCKET/$PREFIX/grype/$DOCKER_IMAGE"
 echo "https_s3_path=$HTTPS_S3_PATH" >> $GITHUB_OUTPUT
 
 tfs --no-colors transform nice raw.log nice.log.txt

From cf25ee80a9be81cab8725a1378c728775a6a0918 Mon Sep 17 00:00:00 2001
From: strtgbb <146047128+strtgbb@users.noreply.github.com>
Date: Thu, 18 Sep 2025 09:13:52 -0400
Subject: [PATCH 2/6] update report upload path

---
 .../create_workflow_report/create_workflow_report.py       | 5 ++++-
 .github/workflows/backport_branches.yml                    | 7 ++++++-
 .github/workflows/master.yml                               | 7 ++++++-
 .github/workflows/merge_queue.yml                          | 7 ++++++-
 .github/workflows/nightly_fuzzers.yml                      | 7 ++++++-
 .github/workflows/nightly_jepsen.yml                       | 7 ++++++-
 .github/workflows/nightly_statistics.yml                   | 7 ++++++-
 .github/workflows/pull_request.yml                         | 7 ++++++-
 .github/workflows/release_branches.yml                     | 7 ++++++-
 ci/praktika/yaml_additional_templates.py                   | 7 ++++++-
 10 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/.github/actions/create_workflow_report/create_workflow_report.py b/.github/actions/create_workflow_report/create_workflow_report.py
index 15cc8ee1eb63..56f7fd829525 100755
--- a/.github/actions/create_workflow_report/create_workflow_report.py
+++ b/.github/actions/create_workflow_report/create_workflow_report.py
@@ -823,7 +823,10 @@ def create_workflow_report(
         print(f"Report saved to {report_path}")
         exit(0)
 
-    report_destination_key = f"{pr_number}/{commit_sha}/{report_name}"
+    if pr_number == 0:
+        report_destination_key = f"REFs/{branch_name}/{commit_sha}/{report_name}"
+    else:
+        report_destination_key = f"PRs/{pr_number}/{commit_sha}/{report_name}"
 
     # Upload the report to S3
     s3_client = boto3.client("s3", endpoint_url=os.getenv("S3_URL"))
diff --git a/.github/workflows/backport_branches.yml b/.github/workflows/backport_branches.yml
index 2e2b5d9eeccd..7966b8559725 100644
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@@ -63,7 +63,12 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
-          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PR_NUMBER/$COMMIT_SHA/ci_run_report.html
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/ci_run_report.html
           echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
 
       - name: Prepare env script
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index c12bcc250c3e..0dd99a4e56e2 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -62,7 +62,12 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
-          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PR_NUMBER/$COMMIT_SHA/ci_run_report.html
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/ci_run_report.html
           echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
 
       - name: Prepare env script
diff --git a/.github/workflows/merge_queue.yml b/.github/workflows/merge_queue.yml
index 936c130ca473..80b43004b53a 100644
--- a/.github/workflows/merge_queue.yml
+++ b/.github/workflows/merge_queue.yml
@@ -51,7 +51,12 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
-          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PR_NUMBER/$COMMIT_SHA/ci_run_report.html
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/ci_run_report.html
           echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
 
       - name: Prepare env script
diff --git a/.github/workflows/nightly_fuzzers.yml b/.github/workflows/nightly_fuzzers.yml
index fe3ea9745235..183026b93b12 100644
--- a/.github/workflows/nightly_fuzzers.yml
+++ b/.github/workflows/nightly_fuzzers.yml
@@ -39,7 +39,12 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
-          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PR_NUMBER/$COMMIT_SHA/ci_run_report.html
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/ci_run_report.html
           echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
 
       - name: Prepare env script
diff --git a/.github/workflows/nightly_jepsen.yml b/.github/workflows/nightly_jepsen.yml
index de261549a1e6..da53c876c0e7 100644
--- a/.github/workflows/nightly_jepsen.yml
+++ b/.github/workflows/nightly_jepsen.yml
@@ -39,7 +39,12 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
-          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PR_NUMBER/$COMMIT_SHA/ci_run_report.html
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/ci_run_report.html
           echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
 
       - name: Prepare env script
diff --git a/.github/workflows/nightly_statistics.yml b/.github/workflows/nightly_statistics.yml
index b6ae541d3fcc..6183972cb965 100644
--- a/.github/workflows/nightly_statistics.yml
+++ b/.github/workflows/nightly_statistics.yml
@@ -39,7 +39,12 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
-          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PR_NUMBER/$COMMIT_SHA/ci_run_report.html
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/ci_run_report.html
           echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
 
       - name: Prepare env script
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 8479ee4fc617..70fac2139dd5 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -63,7 +63,12 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
-          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PR_NUMBER/$COMMIT_SHA/ci_run_report.html
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/ci_run_report.html
           echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
 
       - name: Prepare env script
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index 39d6d38bb5ab..1887ba8b4f0e 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -62,7 +62,12 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
-          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PR_NUMBER/$COMMIT_SHA/ci_run_report.html
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/ci_run_report.html
           echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
 
       - name: Prepare env script
diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py
index 9445452e0ab6..1be49f4a861b 100644
--- a/ci/praktika/yaml_additional_templates.py
+++ b/ci/praktika/yaml_additional_templates.py
@@ -26,7 +26,12 @@ class AltinityWorkflowTemplates:
           PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
-          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PR_NUMBER/$COMMIT_SHA/ci_run_report.html
+          if [ "$PR_NUMBER" -eq 0 ]; then
+            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+          else
+            PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+          fi
+          REPORT_LINK=https://s3.amazonaws.com/altinity-build-artifacts/$PREFIX/ci_run_report.html
           echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
 """
     # Additional jobs

From 8238532a5cfa4760f11a2c8a329705556b70341d Mon Sep 17 00:00:00 2001
From: strtgbb <146047128+strtgbb@users.noreply.github.com>
Date: Thu, 18 Sep 2025 10:27:55 -0400
Subject: [PATCH 3/6] fix preview report and grype links

---
 .github/grype/transform_and_upload_results_s3.sh | 2 +-
 .github/workflows/backport_branches.yml          | 2 +-
 .github/workflows/master.yml                     | 2 +-
 .github/workflows/merge_queue.yml                | 2 +-
 .github/workflows/nightly_fuzzers.yml            | 2 +-
 .github/workflows/nightly_jepsen.yml             | 2 +-
 .github/workflows/nightly_statistics.yml         | 2 +-
 .github/workflows/pull_request.yml               | 2 +-
 .github/workflows/release_branches.yml           | 2 +-
 ci/praktika/yaml_additional_templates.py         | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/grype/transform_and_upload_results_s3.sh b/.github/grype/transform_and_upload_results_s3.sh
index fcb9379a325a..2f2303dbb471 100755
--- a/.github/grype/transform_and_upload_results_s3.sh
+++ b/.github/grype/transform_and_upload_results_s3.sh
@@ -1,7 +1,7 @@
 DOCKER_IMAGE=$(echo "$DOCKER_IMAGE" | sed 's/[\/:]/_/g')
 
 if [ "$PR_NUMBER" -eq 0 ]; then
-    PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+    PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
 else
     PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
 fi
diff --git a/.github/workflows/backport_branches.yml b/.github/workflows/backport_branches.yml
index 7966b8559725..696c194d3281 100644
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@@ -64,7 +64,7 @@ jobs:
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
           if [ "$PR_NUMBER" -eq 0 ]; then
-            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
           else
             PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
           fi
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 0dd99a4e56e2..4af7287fc36d 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -63,7 +63,7 @@ jobs:
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
           if [ "$PR_NUMBER" -eq 0 ]; then
-            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
           else
             PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
           fi
diff --git a/.github/workflows/merge_queue.yml b/.github/workflows/merge_queue.yml
index 80b43004b53a..85bb12580dfe 100644
--- a/.github/workflows/merge_queue.yml
+++ b/.github/workflows/merge_queue.yml
@@ -52,7 +52,7 @@ jobs:
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
           if [ "$PR_NUMBER" -eq 0 ]; then
-            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
           else
             PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
           fi
diff --git a/.github/workflows/nightly_fuzzers.yml b/.github/workflows/nightly_fuzzers.yml
index 183026b93b12..2b1bd4480f20 100644
--- a/.github/workflows/nightly_fuzzers.yml
+++ b/.github/workflows/nightly_fuzzers.yml
@@ -40,7 +40,7 @@ jobs:
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
           if [ "$PR_NUMBER" -eq 0 ]; then
-            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
           else
             PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
           fi
diff --git a/.github/workflows/nightly_jepsen.yml b/.github/workflows/nightly_jepsen.yml
index da53c876c0e7..7cd171e22ced 100644
--- a/.github/workflows/nightly_jepsen.yml
+++ b/.github/workflows/nightly_jepsen.yml
@@ -40,7 +40,7 @@ jobs:
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
           if [ "$PR_NUMBER" -eq 0 ]; then
-            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
           else
             PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
           fi
diff --git a/.github/workflows/nightly_statistics.yml b/.github/workflows/nightly_statistics.yml
index 6183972cb965..78aab3aeae99 100644
--- a/.github/workflows/nightly_statistics.yml
+++ b/.github/workflows/nightly_statistics.yml
@@ -40,7 +40,7 @@ jobs:
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
           if [ "$PR_NUMBER" -eq 0 ]; then
-            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
           else
             PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
           fi
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 70fac2139dd5..e90b1074bcf8 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -64,7 +64,7 @@ jobs:
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
           if [ "$PR_NUMBER" -eq 0 ]; then
-            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
           else
             PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
           fi
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index 1887ba8b4f0e..cc0b81dfaa17 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -63,7 +63,7 @@ jobs:
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
           if [ "$PR_NUMBER" -eq 0 ]; then
-            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
           else
             PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
           fi
diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py
index 1be49f4a861b..8f28fb76666e 100644
--- a/ci/praktika/yaml_additional_templates.py
+++ b/ci/praktika/yaml_additional_templates.py
@@ -27,7 +27,7 @@ class AltinityWorkflowTemplates:
           COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
         run: |
           if [ "$PR_NUMBER" -eq 0 ]; then
-            PREFIX="REFs/$BRANCH/$COMMIT_SHA"
+            PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
           else
             PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
           fi

From 7aeac0f906cb1a41dd808b5d56bafdeb587ea378 Mon Sep 17 00:00:00 2001
From: strtgbb <146047128+strtgbb@users.noreply.github.com>
Date: Thu, 18 Sep 2025 21:05:12 -0400
Subject: [PATCH 4/6] fix layout of report meta tags

---
 .../actions/create_workflow_report/ci_run_report.html.jinja    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/actions/create_workflow_report/ci_run_report.html.jinja b/.github/actions/create_workflow_report/ci_run_report.html.jinja
index d4d4f545c06f..ac9a7a70bb01 100644
--- a/.github/actions/create_workflow_report/ci_run_report.html.jinja
+++ b/.github/actions/create_workflow_report/ci_run_report.html.jinja
@@ -5,6 +5,9 @@
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  {%- if is_preview %}
+  <meta http-equiv="Cache-Control" content="max-age=300">
+  {%- endif %}
   <style>
     /* Base colors for Altinity */
     :root {

From 00a9c37ddc8de58fa0d6fc07247402edb7b9046e Mon Sep 17 00:00:00 2001
From: strtgbb <146047128+strtgbb@users.noreply.github.com>
Date: Fri, 19 Sep 2025 10:03:24 -0400
Subject: [PATCH 5/6] fix grype https s3 paths

---
 .github/grype/transform_and_upload_results_s3.sh | 13 +++++++------
 .github/workflows/grype_scan.yml                 |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/grype/transform_and_upload_results_s3.sh b/.github/grype/transform_and_upload_results_s3.sh
index 2f2303dbb471..38674d7a2a26 100755
--- a/.github/grype/transform_and_upload_results_s3.sh
+++ b/.github/grype/transform_and_upload_results_s3.sh
@@ -1,17 +1,18 @@
 DOCKER_IMAGE=$(echo "$DOCKER_IMAGE" | sed 's/[\/:]/_/g')
 
 if [ "$PR_NUMBER" -eq 0 ]; then
-    PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA"
+    PREFIX="REFs/$GITHUB_REF_NAME/$COMMIT_SHA/grype/$DOCKER_IMAGE"
 else
-    PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA"
+    PREFIX="PRs/$PR_NUMBER/$COMMIT_SHA/grype/$DOCKER_IMAGE"
 fi
 
-S3_PATH="s3://$S3_BUCKET/$PREFIX/grype/$DOCKER_IMAGE"
-HTTPS_S3_PATH="https://s3.amazonaws.com/$S3_BUCKET/$PREFIX/grype/$DOCKER_IMAGE"
-echo "https_s3_path=$HTTPS_S3_PATH" >> $GITHUB_OUTPUT
+S3_PATH="s3://$S3_BUCKET/$PREFIX"
+HTTPS_RESULTS_PATH="https://$S3_BUCKET.s3.amazonaws.com/index.html#$PREFIX/"
+HTTPS_REPORT_PATH="https://s3.amazonaws.com/$S3_BUCKET/$PREFIX/results.html"
+echo "https_report_path=$HTTPS_REPORT_PATH" >> $GITHUB_OUTPUT
 
 tfs --no-colors transform nice raw.log nice.log.txt
-tfs --no-colors report results -a $HTTPS_S3_PATH raw.log - --copyright "Altinity LTD" | tfs --no-colors document convert > results.html
+tfs --no-colors report results -a $HTTPS_RESULTS_PATH raw.log - --copyright "Altinity LTD" | tfs --no-colors document convert > results.html
 
 aws s3 cp --no-progress nice.log.txt $S3_PATH/nice.log.txt --content-type "text/plain; charset=utf-8" || echo "nice log file not found".
 aws s3 cp --no-progress results.html $S3_PATH/results.html || echo "results file not found".
diff --git a/.github/workflows/grype_scan.yml b/.github/workflows/grype_scan.yml
index fd8de01b6d2b..6d640e552898 100644
--- a/.github/workflows/grype_scan.yml
+++ b/.github/workflows/grype_scan.yml
@@ -139,7 +139,7 @@ jobs:
                 repo: context.repo.repo,
                 sha: '${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}',
                 state: hasError ? 'error' : hasVulnerabilities ? 'failure' : 'success',
-                target_url: '${{ steps.upload_results.outputs.https_s3_path }}/results.html',
+                target_url: '${{ steps.upload_results.outputs.https_report_path }}',
                 description: hasError ? 'An error occurred' : `Grype Scan Completed with ${totalHighCritical} high/critical vulnerabilities`,
                 context: 'Grype Scan ${{ steps.set_version.outputs.docker_image || inputs.docker_image }}'
               });

From 6123b5c9a43c088231521c743fdea33f3a5e67df Mon Sep 17 00:00:00 2001
From: MyroTk <myroslav6@gmail.com>
Date: Wed, 1 Oct 2025 21:37:16 -0400
Subject: [PATCH 6/6] update regression to bf856e2

---
 .github/workflows/backport_branches.yml  | 4 ++--
 .github/workflows/master.yml             | 4 ++--
 .github/workflows/pull_request.yml       | 4 ++--
 .github/workflows/release_branches.yml   | 4 ++--
 ci/praktika/yaml_additional_templates.py | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/backport_branches.yml b/.github/workflows/backport_branches.yml
index 696c194d3281..ee1c1b4fe346 100644
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@@ -1529,7 +1529,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-regression-tester
-      commit: eadf0647501a547d57c49b71ca256e10c6c304f6
+      commit: bf856e2a535d5bb7a010cc2c2992c75d14df3c0e
       arch: release
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
@@ -1541,7 +1541,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-regression-tester-aarch64
-      commit: eadf0647501a547d57c49b71ca256e10c6c304f6
+      commit: bf856e2a535d5bb7a010cc2c2992c75d14df3c0e
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 4af7287fc36d..9103111d9a97 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -4003,7 +4003,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-regression-tester
-      commit: eadf0647501a547d57c49b71ca256e10c6c304f6
+      commit: bf856e2a535d5bb7a010cc2c2992c75d14df3c0e
       arch: release
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
@@ -4015,7 +4015,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-regression-tester-aarch64
-      commit: eadf0647501a547d57c49b71ca256e10c6c304f6
+      commit: bf856e2a535d5bb7a010cc2c2992c75d14df3c0e
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index e90b1074bcf8..c9be26cc646f 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -3959,7 +3959,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-regression-tester
-      commit: eadf0647501a547d57c49b71ca256e10c6c304f6
+      commit: bf856e2a535d5bb7a010cc2c2992c75d14df3c0e
       arch: release
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
@@ -3971,7 +3971,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-regression-tester-aarch64
-      commit: eadf0647501a547d57c49b71ca256e10c6c304f6
+      commit: bf856e2a535d5bb7a010cc2c2992c75d14df3c0e
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index cc0b81dfaa17..976698237d28 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -1888,7 +1888,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-regression-tester
-      commit: eadf0647501a547d57c49b71ca256e10c6c304f6
+      commit: bf856e2a535d5bb7a010cc2c2992c75d14df3c0e
       arch: release
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
@@ -1900,7 +1900,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-regression-tester-aarch64
-      commit: eadf0647501a547d57c49b71ca256e10c6c304f6
+      commit: bf856e2a535d5bb7a010cc2c2992c75d14df3c0e
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py
index 8f28fb76666e..f26b82c9275d 100644
--- a/ci/praktika/yaml_additional_templates.py
+++ b/ci/praktika/yaml_additional_templates.py
@@ -35,7 +35,7 @@ class AltinityWorkflowTemplates:
           echo "Workflow Run Report: [View Report]($REPORT_LINK)" >> $GITHUB_STEP_SUMMARY
 """
     # Additional jobs
-    REGRESSION_HASH = "eadf0647501a547d57c49b71ca256e10c6c304f6"
+    REGRESSION_HASH = "bf856e2a535d5bb7a010cc2c2992c75d14df3c0e"
     ADDITIONAL_JOBS = r"""
 ##########################################################################################
 ##################################### ALTINITY JOBS ######################################