Skip to content

Commit

Permalink
Merge pull request #2898 from dhis2/use-fork-reportportal
Browse files Browse the repository at this point in the history
chore: use reportportal fork
  • Loading branch information
adeldhis2 authored Nov 6, 2023
2 parents 49ce447 + 2486093 commit 808d5b7
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 8 deletions.
4 changes: 2 additions & 2 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ module.exports = defineConfig({
reporterOptions: {
endpoint: process.env.REPORTPORTAL_ENDPOINT,
apiKey: process.env.REPORTPORTAL_API_KEY,
launch: 'data_visualizer_app_master',
launch: 'data_visualizer_app',
project: process.env.REPORTPORTAL_PROJECT,
description: '',
autoMerge: true,
parallel: true,
debug: false,
restClientConfig: {
timeout: 360000,
timeout: 660000,
},
attributes: [
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@dhis2/cli-style": "^10.5.1",
"@dhis2/cypress-commands": "^10.0.3",
"@dhis2/cypress-plugins": "^10.0.2",
"@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",
"cypress": "^12.16.0",
"cypress-tags": "^1.1.2",
Expand Down
21 changes: 16 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2967,12 +2967,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"
Expand All @@ -2998,6 +2997,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.0"
resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz#9cb1c5146ddd6a4968ad96f209c50c62f92f9879"
Expand Down

0 comments on commit 808d5b7

Please sign in to comment.