diff --git a/Jenkinsfile b/Jenkinsfile index 72148d69b..1c5dc0217 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -114,7 +114,9 @@ pipeline { // sh 'cd front' // sh '# export VERSION=e2e-try' sh 'docker build -f salix/back/Dockerfile -t back ./salix' - sh 'docker-compose -f docker-compose.e2e.yml up --build db' + sh 'pnpm i @verdnatura/myt' + sh 'cd salix && npx myt run -t --ci -d -n front_default' + // sh 'docker-compose -f docker-compose.e2e.yml up --build db' sh 'docker run --net=host -v ./test/cypress/storage:/salix/storage -d back' sh 'docker-compose -f docker-compose.e2e.yml up -d --build front' sh 'docker-compose -f docker-compose.e2e.yml up e2e' diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml index f00e68aec..698479a1e 100644 --- a/docker-compose.e2e.yml +++ b/docker-compose.e2e.yml @@ -5,15 +5,15 @@ services: context: . dockerfile: ./Dockerfile.e2e network_mode: host - db: - image: db - command: npx myt run -t -d - build: - context: . - dockerfile: test/cypress/db/Dockerfile - volumes: - - /var/run/docker.sock:/var/run/docker.sock - network_mode: host + # db: + # image: db + # command: npx myt run -t --ci -d -n front_default + # build: + # context: . + # dockerfile: test/cypress/db/Dockerfile + # network_mode: host + # volumes: + # - /var/run/docker.sock:/var/run/docker.sock e2e: image: registry.verdnatura.es/salix-frontend:${VERSION:?} command: npx cypress run diff --git a/test/cypress/db/Dockerfile b/test/cypress/db/Dockerfile index 10b9f3a52..f4d695933 100644 --- a/test/cypress/db/Dockerfile +++ b/test/cypress/db/Dockerfile @@ -1,12 +1,10 @@ -FROM node:20-bookworm -ENV DEBIAN_FRONTEND=noninteractive +FROM node:lts-bookworm ENV SHELL bash ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -RUN apt-get update -RUN apt install -y libkrb5-dev libssl-dev RUN npm install -g pnpm@8.15.1 RUN pnpm setup +RUN apt install libkrb5-dev libssl-dev RUN npm i -g pnpm WORKDIR /salix