From b8fb9709e6965ac6e9acd4196cfa1bf9b49132be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Myl=C3=A8ne?=
 <187286904+mleroy-pass@users.noreply.github.com>
Date: Thu, 23 Jan 2025 14:21:52 +0100
Subject: [PATCH] (BSR)[PRO] desactive allure result

---
 .github/workflows/dev_on_pull_request_workflow.yml | 6 ++----
 .github/workflows/dev_on_push_workflow_main.yml    | 5 ++---
 .github/workflows/dev_on_workflow_tests_pro.yml    | 1 +
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/dev_on_pull_request_workflow.yml b/.github/workflows/dev_on_pull_request_workflow.yml
index 74c9520468e..674b822456b 100644
--- a/.github/workflows/dev_on_pull_request_workflow.yml
+++ b/.github/workflows/dev_on_pull_request_workflow.yml
@@ -245,13 +245,11 @@ jobs:
 
   merge-allure-reports:
     name: "Merge Allure Reports and Push to Allure Repository"
-    needs: [pcapi-init-job, test-pro, test-pro-e2e]
+    needs: [pcapi-init-job, test-pro]
     runs-on: ubuntu-22.04
     if: |
       always() &&
-      !cancelled() &&
-      needs.pcapi-init-job.outputs.pro-changed == 'true' &&
-      (needs.test-pro.result == 'success' || needs.test-pro-e2e.result == 'success')
+      !cancelled() && needs.test-pro.result != 'skipped'
     steps:
       - name: "Install Allure CLI via Yarn"
         run: yarn global add allure-commandline
diff --git a/.github/workflows/dev_on_push_workflow_main.yml b/.github/workflows/dev_on_push_workflow_main.yml
index cbc50b67d18..fc160a21308 100644
--- a/.github/workflows/dev_on_push_workflow_main.yml
+++ b/.github/workflows/dev_on_push_workflow_main.yml
@@ -243,12 +243,11 @@ jobs:
 
   merge-allure-reports:
     name: "Merge Allure Reports and Push to Allure Repository"
-    needs: [test-pro, test-pro-e2e]
+    needs: [test-pro]
     runs-on: ubuntu-22.04
     if: |
       always() &&
-      !cancelled() &&
-      (needs.test-pro.result == 'success' || needs.test-pro-e2e.result == 'success')
+      !cancelled() && needs.test-pro.result != 'skipped'
     steps:
       - name: "Install Allure CLI via Yarn"
         run: yarn global add allure-commandline
diff --git a/.github/workflows/dev_on_workflow_tests_pro.yml b/.github/workflows/dev_on_workflow_tests_pro.yml
index f061e594f69..d54d3ab68e7 100644
--- a/.github/workflows/dev_on_workflow_tests_pro.yml
+++ b/.github/workflows/dev_on_workflow_tests_pro.yml
@@ -90,6 +90,7 @@ jobs:
 
       - name: "Upload Allure results for pro tests"
         uses: actions/upload-artifact@v4
+        if: always()
         with:
           name: allure-results-pro-unit
           path: allure-results