From 8fe745bb74c31ca35cc3c7d7f87866a546bff39e Mon Sep 17 00:00:00 2001
From: Albert Sola <albert.sola@gmail.com>
Date: Thu, 29 Jan 2026 10:51:11 +0000
Subject: [PATCH] MPT-16824 Rename report portal launch and move to use
 attributes

---
 .github/workflows/push-release-branch.yml | 5 +++--
 .github/workflows/release.yml             | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push-release-branch.yml b/.github/workflows/push-release-branch.yml
index 73bacb2..5508e37 100644
--- a/.github/workflows/push-release-branch.yml
+++ b/.github/workflows/push-release-branch.yml
@@ -39,11 +39,12 @@ jobs:
       run: make check-all
 
     - name: "Run E2E test"
-      run: make e2e args="--reportportal --rp-launch=$RP_LAUNCH --rp-api-key=$RP_API_KEY --rp-endpoint=$RP_ENDPOINT"
+      run: make e2e args="--reportportal --rp-launch=$RP_LAUNCH --rp-api-key=$RP_API_KEY --rp-endpoint=$RP_ENDPOINT -o rp_launch_attributes=\"$RP_LAUNCH_ATTR\""
       env:
-        RP_LAUNCH: github-e2e-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_number }}
+        RP_LAUNCH: mpt-api-client-e2e
         RP_ENDPOINT: ${{ secrets.RP_ENDPOINT }}
         RP_API_KEY: ${{ secrets.RP_API_KEY }}
+        RP_LAUNCH_ATTR: ref:${{ github.ref }} event_name:${{ github.event_name }}
 
     - name: "Run SonarCloud Scan"
       uses: SonarSource/sonarqube-scan-action@master
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7942fe3..63bcff7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,11 +35,12 @@ jobs:
         MPT_API_TOKEN_VENDOR: ${{ secrets.MPT_API_TOKEN_VENDOR }}
 
     - name: "Run E2E test"
-      run: make e2e args="--reportportal --rp-launch=$RP_LAUNCH --rp-api-key=$RP_API_KEY --rp-endpoint=$RP_ENDPOINT"
+      run: make e2e args="--reportportal --rp-launch=$RP_LAUNCH --rp-api-key=$RP_API_KEY --rp-endpoint=$RP_ENDPOINT -o rp_launch_attributes=\"$RP_LAUNCH_ATTR\""
       env:
-        RP_LAUNCH: github-e2e-release-${{ github.ref_name }}
+        RP_LAUNCH: mpt-api-client-e2e
         RP_ENDPOINT: ${{ secrets.RP_ENDPOINT }}
         RP_API_KEY: ${{ secrets.RP_API_KEY }}
+        RP_LAUNCH_ATTR: ref:${{ github.ref }} event_name:${{ github.event_name }}
 
     - name: "Set up Python"
       uses: actions/setup-python@v6