From 3549f172d6d19e8fad7baae048fb47c96187207a Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 7 Apr 2025 14:01:37 +0200 Subject: [PATCH 1/3] fix: pass modules as argument to cypressParallel.sh in Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 065096c58..a9db9d369 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -128,7 +128,7 @@ pipeline { def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim() echo "E2E MODULES: ${modules}" image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") { - sh "sh test/cypress/docker/cypressParallel.sh 1" + sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'" } } } From 2b5802a7fba250767e8f05838aef4f3b9b3a9ed9 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 7 Apr 2025 14:01:51 +0200 Subject: [PATCH 2/3] fix: update cypressParallel.sh invocation to use an empty string for modules --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a9db9d369..69f16c7ec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -128,7 +128,7 @@ pipeline { def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim() echo "E2E MODULES: ${modules}" image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") { - sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'" + sh "sh test/cypress/docker/cypressParallel.sh 1 ''" } } } From d142797b1f4cfb522f2f279efd078f4559028671 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 7 Apr 2025 14:03:43 +0200 Subject: [PATCH 3/3] fix: update Jenkinsfile to remove unused module retrieval and modify cypressParallel.sh invocation --- Jenkinsfile | 6 +++--- test/cypress/cypressParallel.sh | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 test/cypress/cypressParallel.sh diff --git a/Jenkinsfile b/Jenkinsfile index 69f16c7ec..f85b2f990 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -125,10 +125,10 @@ pipeline { sh "docker-compose ${env.COMPOSE_PARAMS} pull db" sh "docker-compose ${env.COMPOSE_PARAMS} up -d" - def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim() - echo "E2E MODULES: ${modules}" + // def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim() + // echo "E2E MODULES: ${modules}" image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") { - sh "sh test/cypress/docker/cypressParallel.sh 1 ''" + sh "sh test/cypress/docker/cypressParallel.sh 1" } } } diff --git a/test/cypress/cypressParallel.sh b/test/cypress/cypressParallel.sh new file mode 100644 index 000000000..8ef26bcde --- /dev/null +++ b/test/cypress/cypressParallel.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +find 'test/cypress/integration' \ + -mindepth 1 \ + -maxdepth 1 \ + -type d | \ +xargs -P "$1" -I {} sh -c ' + echo "🔷 {}" && + xvfb-run -a cypress run \ + --headless \ + --spec "{}" \ + --quiet \ + > /dev/null +' +wait