perf: refs #6695 only necessary
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
This commit is contained in:
parent
28613c1e96
commit
1772c31047
|
@ -17,10 +17,9 @@ export default defineConfig({
|
||||||
screenshotsFolder: 'test/cypress/screenshots',
|
screenshotsFolder: 'test/cypress/screenshots',
|
||||||
supportFile: 'test/cypress/support/index.js',
|
supportFile: 'test/cypress/support/index.js',
|
||||||
videosFolder: 'test/cypress/videos',
|
videosFolder: 'test/cypress/videos',
|
||||||
// downloadsFolder: 'test/cypress/downloads',
|
downloadsFolder: 'test/cypress/downloads',
|
||||||
video: false,
|
video: false,
|
||||||
specPattern: 'test/cypress/integration/**/*.spec.js',
|
specPattern: 'test/cypress/integration/**/*.spec.js',
|
||||||
// specPattern: 'test/cypress/integration/client/clientList.spec.js',
|
|
||||||
experimentalRunAllSpecs: true,
|
experimentalRunAllSpecs: true,
|
||||||
watchForFileChanges: true,
|
watchForFileChanges: true,
|
||||||
reporter: 'cypress-mochawesome-reporter',
|
reporter: 'cypress-mochawesome-reporter',
|
||||||
|
|
|
@ -2,26 +2,20 @@ version: '3.7'
|
||||||
services:
|
services:
|
||||||
back:
|
back:
|
||||||
image: registry.verdnatura.es/salix-back:dev
|
image: registry.verdnatura.es/salix-back:dev
|
||||||
# image: back_try
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./test/cypress/storage:/salix/storage
|
- ./test/cypress/storage:/salix/storage
|
||||||
- ./test/cypress/back/datasources.json:/salix/loopback/server/datasources.json
|
- ./test/cypress/back/datasources.json:/salix/loopback/server/datasources.json
|
||||||
depends_on:
|
depends_on:
|
||||||
- vn-database
|
- vn-database
|
||||||
# ports:
|
|
||||||
# - '3000:3000'
|
|
||||||
front:
|
front:
|
||||||
image: alexmorenovn/vndev:latest
|
image: alexmorenovn/vndev:latest
|
||||||
command: quasar dev
|
command: quasar dev
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app:delegated
|
- .:/app
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
environment:
|
environment:
|
||||||
- TZ=Europe/Madrid
|
- TZ=Europe/Madrid
|
||||||
- DOCKER=true
|
- DOCKER=true
|
||||||
# ports:
|
|
||||||
# - '9000:9000'
|
|
||||||
|
|
||||||
e2e:
|
e2e:
|
||||||
image: cypress-setup:latest
|
image: cypress-setup:latest
|
||||||
command: sh -c "while [ ! -d node_modules/cypress ]; do sleep 1; done && pnpm exec cypress run --browser chromium --spec ${CYPRESS_SPEC:?}"
|
command: sh -c "while [ ! -d node_modules/cypress ]; do sleep 1; done && pnpm exec cypress run --browser chromium --spec ${CYPRESS_SPEC:?}"
|
||||||
|
@ -31,15 +25,5 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/app
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
cypress-setup:
|
|
||||||
image: cypress-setup:latest
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: ./test/cypress/Dockerfile
|
|
||||||
command: sh -c "pnpm install --frozen-lockfile && pnpm exec cypress install"
|
|
||||||
volumes:
|
|
||||||
- .:/app:delegated
|
|
||||||
vn-database:
|
vn-database:
|
||||||
image: registry.verdnatura.es/salix-db:dev
|
image: registry.verdnatura.es/salix-db:dev
|
||||||
# ports:
|
|
||||||
# - '3306:3306'
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
reports/*
|
reports/*
|
||||||
videos/*
|
videos/*
|
||||||
screenshots/*
|
screenshots/*
|
||||||
|
downloads/*
|
||||||
storage/*
|
storage/*
|
||||||
reports/*
|
reports/*
|
||||||
docker/logs/*
|
docker/logs/*
|
||||||
|
|
|
@ -9,7 +9,12 @@ source "$(dirname "$0")/summary.sh"
|
||||||
# Manejo de señales para limpiar si se interrumpe el script
|
# Manejo de señales para limpiar si se interrumpe el script
|
||||||
trap cleanup SIGINT
|
trap cleanup SIGINT
|
||||||
# docker-compose -p lilium-e2e -f docker-compose.e2e.local.yml build cypress-setup >/dev/null 2>&1
|
# docker-compose -p lilium-e2e -f docker-compose.e2e.local.yml build cypress-setup >/dev/null 2>&1
|
||||||
|
echo "💿 Construyendo CypressSetup"
|
||||||
docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile . >/dev/null 2>&1
|
docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile . >/dev/null 2>&1
|
||||||
|
echo "💿 Descargando imagenes actualizadas"
|
||||||
|
docker-compose -f docker-compose.e2e.yml pull back front vn-database
|
||||||
|
echo "📀 Actualizadas"
|
||||||
|
|
||||||
# Ejecutar grupos en paralelo y almacenar PIDs
|
# Ejecutar grupos en paralelo y almacenar PIDs
|
||||||
for i in "${!groups[@]}"; do
|
for i in "${!groups[@]}"; do
|
||||||
run_group "${groups[$i]}" "$((i+1))" & # Ejecutar en segundo plano
|
run_group "${groups[$i]}" "$((i+1))" & # Ejecutar en segundo plano
|
||||||
|
|
|
@ -43,7 +43,7 @@ run_group() {
|
||||||
folderName=$(basename "$testFolder" | tr -cd 'a-zA-Z0-9_-')
|
folderName=$(basename "$testFolder" | tr -cd 'a-zA-Z0-9_-')
|
||||||
uniqueName="${NETWORK}_${folderName}_${parallelIndex}_${groupIndex}"
|
uniqueName="${NETWORK}_${folderName}_${parallelIndex}_${groupIndex}"
|
||||||
|
|
||||||
echo "🔹 $folderName (Grupo: $parallelIndex, Índice: $groupIndex) - Up"
|
echo "🔹 $folderName (Grupo: $parallelIndex, Índice: $groupIndex) - Levantado"
|
||||||
|
|
||||||
export CYPRESS_SPEC="test/cypress/integration/${folderName}/**/*.spec.js"
|
export CYPRESS_SPEC="test/cypress/integration/${folderName}/**/*.spec.js"
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ run_group() {
|
||||||
|
|
||||||
# 🔹 Esperar a que la API en /api/Applications/status devuelva { "status": true }
|
# 🔹 Esperar a que la API en /api/Applications/status devuelva { "status": true }
|
||||||
wait_for_api_ready "Aplicación" "front" 9000 "/api/Applications/status" "${uniqueName}_default"
|
wait_for_api_ready "Aplicación" "front" 9000 "/api/Applications/status" "${uniqueName}_default"
|
||||||
echo "🌐 $folderName (Grupo: $parallelIndex, Índice: $groupIndex) - Connected"
|
echo "🌐 $folderName (Grupo: $parallelIndex, Índice: $groupIndex) - Conectado"
|
||||||
|
|
||||||
# 🚀 Ejecutar pruebas en modo detach
|
# 🚀 Ejecutar pruebas en modo detach
|
||||||
docker-compose -p "$uniqueName" -f docker-compose.e2e.local.yml up -d e2e >/dev/null 2>&1
|
docker-compose -p "$uniqueName" -f docker-compose.e2e.local.yml up -d e2e >/dev/null 2>&1
|
||||||
|
|
Loading…
Reference in New Issue