feat(jenkinsE2E): refs #6695 try fix db
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2024-10-07 13:51:21 +02:00
parent f7bc5f5aff
commit e4b709013e
3 changed files with 14 additions and 14 deletions

4
Jenkinsfile vendored
View File

@ -114,7 +114,9 @@ pipeline {
// sh 'cd front' // sh 'cd front'
// sh '# export VERSION=e2e-try' // sh '# export VERSION=e2e-try'
sh 'docker build -f salix/back/Dockerfile -t back ./salix' 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 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 -d --build front'
sh 'docker-compose -f docker-compose.e2e.yml up e2e' sh 'docker-compose -f docker-compose.e2e.yml up e2e'

View File

@ -5,15 +5,15 @@ services:
context: . context: .
dockerfile: ./Dockerfile.e2e dockerfile: ./Dockerfile.e2e
network_mode: host network_mode: host
db: # db:
image: db # image: db
command: npx myt run -t -d # command: npx myt run -t --ci -d -n front_default
build: # build:
context: . # context: .
dockerfile: test/cypress/db/Dockerfile # dockerfile: test/cypress/db/Dockerfile
volumes: # network_mode: host
- /var/run/docker.sock:/var/run/docker.sock # volumes:
network_mode: host # - /var/run/docker.sock:/var/run/docker.sock
e2e: e2e:
image: registry.verdnatura.es/salix-frontend:${VERSION:?} image: registry.verdnatura.es/salix-frontend:${VERSION:?}
command: npx cypress run command: npx cypress run

View File

@ -1,12 +1,10 @@
FROM node:20-bookworm FROM node:lts-bookworm
ENV DEBIAN_FRONTEND=noninteractive
ENV SHELL bash ENV SHELL bash
ENV PNPM_HOME="/pnpm" ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH" 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 npm install -g pnpm@8.15.1
RUN pnpm setup RUN pnpm setup
RUN apt install libkrb5-dev libssl-dev
RUN npm i -g pnpm RUN npm i -g pnpm
WORKDIR /salix WORKDIR /salix