From c6c18e82fa7b812ca81d7c889d24d18d191d8d99 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 14 Feb 2025 15:06:47 +0100 Subject: [PATCH] test: refs #6695 e2e front, use build --- test/cypress/docker/run/main.sh | 3 ++- test/cypress/docker/run/run_group.sh | 7 ++++--- test/cypress/docker/run/summary.sh | 10 +++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/test/cypress/docker/run/main.sh b/test/cypress/docker/run/main.sh index 23a0d6b9fd1..6cbe7067872 100644 --- a/test/cypress/docker/run/main.sh +++ b/test/cypress/docker/run/main.sh @@ -8,7 +8,8 @@ source "$(dirname "$0")/summary.sh" # Manejo de señales para limpiar si se interrumpe el script trap cleanup SIGINT - +# docker-compose -p lilium-e2e -f docker-compose.e2e.local.yml build cypress-setup >/dev/null 2>&1 +docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile . >/dev/null 2>&1 # Ejecutar grupos en paralelo y almacenar PIDs for i in "${!groups[@]}"; do run_group "${groups[$i]}" "$((i+1))" & # Ejecutar en segundo plano diff --git a/test/cypress/docker/run/run_group.sh b/test/cypress/docker/run/run_group.sh index 9befa55c601..7980a07f6e0 100644 --- a/test/cypress/docker/run/run_group.sh +++ b/test/cypress/docker/run/run_group.sh @@ -6,7 +6,7 @@ wait_for_api_ready() { local container_name="$2" local port="$3" local path="$4" - local network="$5" + local network="${5,,}" local max_retries=30 # Máximo de intentos (30 segundos) local retries=0 local url="http://$container_name:$port$path" @@ -36,14 +36,14 @@ run_group() { local parallelIndex="$2" local groupIndex=1 + echo "=== Ejecutando grupo paralelo ${parallelIndex} ===" - docker-compose -p lilium-e2e -f docker-compose.e2e.local.yml build cypress-setup >/dev/null 2>&1 for testFolder in $group; do folderName=$(basename "$testFolder" | tr -cd 'a-zA-Z0-9_-') uniqueName="${NETWORK}_${folderName}_${parallelIndex}_${groupIndex}" - echo "🔹 $folderName (Grupo: $parallelIndex, Índice: $groupIndex)" + echo "🔹 $folderName (Grupo: $parallelIndex, Índice: $groupIndex) - Up" export CYPRESS_SPEC="test/cypress/integration/${folderName}/**/*.spec.js" @@ -53,6 +53,7 @@ run_group() { # 🔹 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" + echo "🌐 $folderName (Grupo: $parallelIndex, Índice: $groupIndex) - Connected" # 🚀 Ejecutar pruebas en modo detach docker-compose -p "$uniqueName" -f docker-compose.e2e.local.yml up -d e2e >/dev/null 2>&1 diff --git a/test/cypress/docker/run/summary.sh b/test/cypress/docker/run/summary.sh index 04e4c6a874f..03e1fb2fb58 100644 --- a/test/cypress/docker/run/summary.sh +++ b/test/cypress/docker/run/summary.sh @@ -3,11 +3,11 @@ generate_summary() { # Verificar si hay archivos en el directorio de logs (indicando fallos) if [[ -d "$LOG_DIR" && "$(ls -A "$LOG_DIR")" ]]; then - echo "❌ Se encontraron fallos en los siguientes tests:" - for log_file in "$LOG_DIR"/*.log; do - test_name=$(basename "$log_file" .log) - echo " - $test_name (log en $log_file)" - done + echo "❌ Se encontraron fallos en los tests, revise: $LOG_DIR" + # for log_file in "$LOG_DIR"/*.log; do + # test_name=$(basename "$log_file" .log) + # echo " - $test_name (log en $log_file)" + # done exit 1 # Devolver código de error para que Jenkins lo detecte else echo "✅ Todas las pruebas han pasado correctamente."