From c7d299719bcbf4fe44c199d06f6a2691c112dc16 Mon Sep 17 00:00:00 2001
From: Adel Bensaad <adel@dhis2.org>
Date: Wed, 8 Nov 2023 11:03:29 +0300
Subject: [PATCH] chore: use reportportal fork find a launch by : PR_TITLE
 BRANCH_NAME CI_BUILD_ID

---
 .github/workflows/dhis2-verify-app.yml |  2 ++
 package.json                           |  2 +-
 yarn.lock                              | 21 ++++++++++++++++-----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml
index 5e8b5f20b..14b25889f 100644
--- a/.github/workflows/dhis2-verify-app.yml
+++ b/.github/workflows/dhis2-verify-app.yml
@@ -93,6 +93,8 @@ jobs:
 
         env:
             CI_BUILD_ID: ${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}
+            BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+            PR_TITLE: ${{ github.event.pull_request.title }}
 
         strategy:
             fail-fast: false
diff --git a/package.json b/package.json
index bb59cedf9..caa0eebc5 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
         "@dhis2/cli-style": "10.5.1",
         "@dhis2/cypress-commands": "^10.0.1",
         "@dhis2/cypress-plugins": "^10.0.1",
-        "@reportportal/agent-js-cypress": "^5.1.3",
+        "@reportportal/agent-js-cypress": "git+https://github.com/dhis2/agent-js-cypress.git#develop",
         "@reportportal/agent-js-jest": "^5.0.6",
         "@testing-library/jest-dom": "5.16.5",
         "@testing-library/react": "12.1.5",
diff --git a/yarn.lock b/yarn.lock
index 8515fd52a..2506957dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3352,12 +3352,11 @@
     "@react-hook/passive-layout-effect" "^1.2.0"
     "@react-hook/resize-observer" "^1.2.1"
 
-"@reportportal/agent-js-cypress@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@reportportal/agent-js-cypress/-/agent-js-cypress-5.1.3.tgz#596aa9657ad0e8fd7dc57f08304b73decf375d44"
-  integrity sha512-20UBwMR+EGJ0eNGK23kJxYkUp5+43G8wGmWaJCzozp7ihWK/I3mj+SkgjQ5F8FvExGi91ivAbpoXha8Ak5SZuQ==
+"@reportportal/agent-js-cypress@git+https://github.com/dhis2/agent-js-cypress.git#develop":
+  version "5.1.4"
+  resolved "git+https://github.com/dhis2/agent-js-cypress.git#d3afea4e74abdbef39c1121f820f23deca2368f4"
   dependencies:
-    "@reportportal/client-javascript" "^5.0.12"
+    "@reportportal/client-javascript" "^5.0.14"
     glob "^7.2.3"
     minimatch "^3.1.2"
     mocha "^10.2.0"
@@ -3383,6 +3382,18 @@
     uniqid "^5.4.0"
     uuid "^9.0.0"
 
+"@reportportal/client-javascript@^5.0.14":
+  version "5.0.14"
+  resolved "https://registry.yarnpkg.com/@reportportal/client-javascript/-/client-javascript-5.0.14.tgz#48a40f2f33129d74bb7e451aaf25d44742e26fcc"
+  integrity sha512-4ge9ddOB1rFlzqI6j43qCw0cyjQOloiPChA1EFyF3dcV2BXHzGbh8S3SNhwxibvlQtV6piU8e0W9CLN4UWXvSA==
+  dependencies:
+    axios "^0.27.2"
+    axios-retry "^3.4.0"
+    glob "^7.2.3"
+    ini "^2.0.0"
+    uniqid "^5.4.0"
+    uuid "^9.0.0"
+
 "@rollup/plugin-babel@^5.2.0":
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283"