verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 101 Releases Wiki Activity

fix: refs #6695 update Jenkinsfile to remove specific e2e XML files and adjust Cypress parallel execution
gitea/salix-front/pipeline/pr-dev This commit is unstable Details

This commit is contained in:
Alex Moreno 2025-02-28 09:39:28 +01:00
parent b3218117cc
commit 9bcbc7333e
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -113,7 +113,7 @@ pipeline {
} }
steps { steps {
script { 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' env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
sh "docker-compose ${env.COMPOSE_PARAMS} up -d" sh "docker-compose ${env.COMPOSE_PARAMS} up -d"

17
cypress.config.js
View File

@ -67,18 +67,15 @@ export default defineConfig({
viewportWidth: 1280, viewportWidth: 1280,
viewportHeight: 720, viewportHeight: 720,
...timeouts, ...timeouts,
// setupNodeEvents(on, config) {
// process.env.NODE_OPTIONS = '--loader ts-node/esm';
// return config;
// },
includeShadowDom: true, includeShadowDom: true,
waitForAnimations: true, waitForAnimations: true,
// setupNodeEvents(on, config) { setupNodeEvents(on, config) {
// on('before:browser:launch', (browser = {}, launchOptions) => { on('before:browser:launch', (browser = {}, launchOptions) => {
// launchOptions.args.push('--disable-gpu'); launchOptions.args.push('--disable-gpu');
launchOptions.args.push('--no-sandbox');
// return launchOptions; return launchOptions;
// }); });
// }, },
}, },
}); });

2
test/cypress/run.sh
View File

@ -23,7 +23,7 @@ docker run -it --rm \
lilium-dev \ lilium-dev \
bash -c ' bash -c '
source test/cypress/cypressParallel.sh source test/cypress/cypressParallel.sh
cypressParallel 3 cypressParallel 2
' '
cleanup cleanup