From e6024eb110ba7f674d4635d59e976dbb2922aaa8 Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <nicolas.arenas@gmail.com>
Date: Wed, 23 Oct 2024 08:17:28 +0200
Subject: [PATCH] Generate stuff report before tests

---
 Jenkinsfile                     | 22 +++++++---------------
 docker-compose-ci-template.yaml |  2 ++
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 841efba..a8b07f1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,11 +46,11 @@ pipeline {
             steps {
                 // Install dependencies
                 sh """
+                rm -rf ./report
                 docker compose exec php composer install
                 docker compose exec php php bin/console lexik:jwt:generate-keypair --overwrite
                 docker compose exec php php bin/console doctrine:migrations:migrate --no-interaction
                 docker compose exec php php bin/console doctrine:fixtures:load --no-interaction
-                docker compose exec php mkdir -p /report
                 """
             }
         }
@@ -59,19 +59,9 @@ pipeline {
                 // Run tests
                 sh """
                 docker compose exec php bin/phpunit --log-junit /report/phpunit.xml
-                docker compose cp php:/report/phpunit.xml ./phpunit.xml
                 """
             }
         }
-        stage ("Delete Image") {
-            steps {
-                script {
-                    sh "docker compose -f ${DOCKER_COMPOSE_FILE} down"
-                    sh "docker rmi ${DOCKER_IDENTITY}"
-                    sh "docker rmi ${DOCKER_IDENTITY_NGINX}"
-                }
-            }
-        }
         stage ("Publish Image") {
             steps {
                 script {
@@ -86,14 +76,16 @@ pipeline {
     }
     post {
         always {
-            // Publicar los resultados de las pruebas de PHPUnit
+            // Publish JUnit test results
             xunit (
-                thresholds: [ skipped(failureThreshold: '0'), failed(failureThreshold: '0') ], 
+                thresholds: [ skipped(failureThreshold: '0') , failed(failureThreshold: '0') ], 
                 tools: [ PHPUnit(pattern: 'phpunit.xml') ]
             )
             // Remove containers
-            sh 'docker compose -f ${DOCKER_COMPOSE_FILE} down'
-            sh 'docker compose -f ${DOCKER_COMPOSE_FILE} rm -f'
+            sh "docker compose -f ${DOCKER_COMPOSE_FILE} down"
+            sh "docker compose -f ${DOCKER_COMPOSE_FILE} rm -f"
+            sh "docker rmi ${DOCKER_IDENTITY}"
+            sh "docker rmi ${DOCKER_IDENTITY_NGINX}"
         }
     }
 }
diff --git a/docker-compose-ci-template.yaml b/docker-compose-ci-template.yaml
index b407aa8..0863431 100644
--- a/docker-compose-ci-template.yaml
+++ b/docker-compose-ci-template.yaml
@@ -43,6 +43,8 @@ services:
     networks:
       - ogcore-network
     image: ogcore-php:static
+    volumes: 
+      - ./report:/report/
 
 volumes:
   database_data: