From 9bcbc7333eedfbe1077fe5e05b8a26f344da1713 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 28 Feb 2025 09:39:28 +0100 Subject: [PATCH] fix: refs #6695 update Jenkinsfile to remove specific e2e XML files and adjust Cypress parallel execution --- Jenkinsfile | 2 +- cypress.config.js | 17 +++++++---------- test/cypress/run.sh | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 21614c264..6278584a8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -113,7 +113,7 @@ pipeline { } steps { script { - sh 'find ./junit -type f -name "e2e-*" -delete || true' + sh 'rm junit/e2e-*.xml || true' env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev' def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') sh "docker-compose ${env.COMPOSE_PARAMS} up -d" diff --git a/cypress.config.js b/cypress.config.js index bca9d672c..6db1dd86f 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -67,18 +67,15 @@ export default defineConfig({ viewportWidth: 1280, viewportHeight: 720, ...timeouts, - // setupNodeEvents(on, config) { - // process.env.NODE_OPTIONS = '--loader ts-node/esm'; - // return config; - // }, includeShadowDom: true, waitForAnimations: true, - // setupNodeEvents(on, config) { - // on('before:browser:launch', (browser = {}, launchOptions) => { - // launchOptions.args.push('--disable-gpu'); + setupNodeEvents(on, config) { + on('before:browser:launch', (browser = {}, launchOptions) => { + launchOptions.args.push('--disable-gpu'); + launchOptions.args.push('--no-sandbox'); - // return launchOptions; - // }); - // }, + return launchOptions; + }); + }, }, }); diff --git a/test/cypress/run.sh b/test/cypress/run.sh index 41effff8f..2a2703d10 100644 --- a/test/cypress/run.sh +++ b/test/cypress/run.sh @@ -23,7 +23,7 @@ docker run -it --rm \ lilium-dev \ bash -c ' source test/cypress/cypressParallel.sh - cypressParallel 3 + cypressParallel 2 ' cleanup