From 4e67d8deca5097f8609fac3ca3272aa00a693762 Mon Sep 17 00:00:00 2001
From: Adel Bensaad <adel@dhis2.org>
Date: Mon, 6 Nov 2023 10:48:36 +0000
Subject: [PATCH] chore: use reportportal fork find a launch by PR_TITLE ,
 BRANCH_NAME and CI_BUILD_ID

---
 .github/workflows/dhis2-verify-app.yml | 3 +++
 cypress.config.js                      | 2 +-
 package.json                           | 2 +-
 yarn.lock                              | 5 ++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml
index 693d8625f4..f3d90d6b47 100644
--- a/.github/workflows/dhis2-verify-app.yml
+++ b/.github/workflows/dhis2-verify-app.yml
@@ -15,6 +15,9 @@ env:
     GIT_COMMITTER_EMAIL: 'apps@dhis2.org'
     GH_TOKEN: ${{secrets.DHIS2_BOT_GITHUB_TOKEN}}
     CI: true
+    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 }}
 
 jobs:
     build:
diff --git a/cypress.config.js b/cypress.config.js
index 3e156464b3..9c7b7fc49b 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -34,7 +34,7 @@ module.exports = defineConfig({
         parallel: true,
         debug: false,
         restClientConfig: {
-            timeout: 360000,
+            timeout: 660000,
         },
         attributes: [
             {
diff --git a/package.json b/package.json
index d4e003b4b8..381faf256c 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
         "@dhis2/maps-gl": "^3.8.5",
         "@dhis2/ui": "^8.13.15",
         "@krakenjs/post-robot": "^11.0.0",
-        "@reportportal/agent-js-cypress": "^5.1.4",
+        "@reportportal/agent-js-cypress": "git+https://github.com/dhis2/agent-js-cypress.git#develop",
         "@reportportal/agent-js-jest": "^5.0.6",
         "abortcontroller-polyfill": "^1.7.5",
         "array-move": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index 8a6df52231..ab81457db6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2957,10 +2957,9 @@
     "@react-hook/passive-layout-effect" "^1.2.0"
     "@react-hook/resize-observer" "^1.2.1"
 
-"@reportportal/agent-js-cypress@^5.1.4":
+"@reportportal/agent-js-cypress@git+https://github.com/dhis2/agent-js-cypress.git#develop":
   version "5.1.4"
-  resolved "https://registry.yarnpkg.com/@reportportal/agent-js-cypress/-/agent-js-cypress-5.1.4.tgz#43d61a6c1e954930cb4d95ad55c892467b484551"
-  integrity sha512-K5a6qwtnMpIO7qAUP1k4ABWmxEImO3eF9d+gdwe4SnDqeKCWB6SqC2MRt/ZcgSNlDTbYxJife5rr0f0OMg+pbA==
+  resolved "git+https://github.com/dhis2/agent-js-cypress.git#d3afea4e74abdbef39c1121f820f23deca2368f4"
   dependencies:
     "@reportportal/client-javascript" "^5.0.14"
     glob "^7.2.3"