diff --git a/Jenkinsfile b/Jenkinsfile index 1a2b4ccac..542c1a4db 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -102,7 +102,7 @@ pipeline { env.NETWORK = "${PROJECT_NAME}-${env.BRANCH_NAME}-${env.BUILD_ID}" cleanDockerE2E() sh "pnpm exec cypress install" - // sh "docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile ." + sh "docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile ." docker.build('cypress-setup:latest', "-f ./test/cypress/Dockerfile .") } @@ -114,17 +114,17 @@ pipeline { sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d" def networkLowerCase = env.NETWORK.toLowerCase() def containerId = sh(script: """ - docker run --name ${env.NETWORK}_cypress + docker run --name ${env.NETWORK}_cypress \ --network ${networkLowerCase}_default \ -e TZ=Europe/Madrid \ -e DOCKER=true \ -e CI=true \ -v .:/app \ -w /app \ - cypress-setup:latest \ + cypress-setup \ pnpm exec cypress run --browser chromium """, returnStdout: true).trim() - checkErrors(containerId) + // checkErrors(containerId) } } } diff --git a/test/cypress/Dockerfile b/test/cypress/Dockerfile index 00b96e376..4f19ca8ac 100644 --- a/test/cypress/Dockerfile +++ b/test/cypress/Dockerfile @@ -1,14 +1,7 @@ FROM alexmorenovn/vndev:latest WORKDIR /app - -# Copiar package.json y pnpm-lock.yaml para evitar reinstalaciones innecesarias COPY package.json pnpm-lock.yaml ./ - -# Copiar node_modules localmente si existe - -# Instalar dependencias, pero sin reinstalar Cypress si ya existe RUN pnpm install --frozen-lockfile && pnpm exec cypress install -# Definir el directorio de trabajo por defecto WORKDIR /app