From 40afa1083c61835e4670517b5b8befab6d5f5ae0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 15 Jan 2024 14:54:13 +0100
Subject: [PATCH] refs #5739 feat: try run test back and front

---
 Jenkinsfile             |  6 +++---
 docker-compose.test.yml | 24 ++++++++++--------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ea8c49b86..41186f8db 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,8 +40,8 @@ pipeline {
             }
             steps {
                 // sh "docker network ls | grep testing-\${env.STACK_NAME} | awk '{print \$1}' | xargs -r docker network rm"
-                sh "docker network ls | grep testing-salix-5739 | awk '{print \$1}' | xargs -r docker network rm"
-                sh "docker network create testing-salix-5739-dockerrefactor_default"
+                // sh "docker network ls | grep testing-salix-5739 | awk '{print \$1}' | xargs -r docker network rm"
+                // sh "docker network create testing-salix-5739-dockerrefactor_default"
                 sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml rm --stop"
                 sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml build --force-rm db back"
                 sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml up db"
@@ -80,7 +80,7 @@ pipeline {
             }
             steps {
                 sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml rm -s -f"
-                // sh "docker-compose -p salix-testing -f docker-compose.test.yml run --rm front"
+                sh "docker network rm testing-${env.STACK_NAME}_default"
             }
         }
         stage('Build') {
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index f1222f549..e15d9d8df 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -18,14 +18,10 @@ services:
         build:
             context: db
             dockerfile: Dockerfile
-        ports:
-            - 3308:3306
     front:
         image: front
         restart: always
         command: ["npx", "jest", "--ci", "--maxWorkers=2"]
-        ports:
-            - 5000:5000
         build:
             context: .
             dockerfile: front/Dockerfile.test
@@ -43,16 +39,16 @@ services:
             - NODE_ENV
         depends_on:
             - db
-    e2e:
-        image: e2e
-        restart: always
-        build:
-            context: .
-            dockerfile: e2e/Dockerfile
-        environment:
-            - NODE_ENV
-        depends_on:
-            - front
+    # e2e:
+    #     image: e2e
+    #     restart: always
+    #     build:
+    #         context: .
+    #         dockerfile: e2e/Dockerfile
+    #     environment:
+    #         - NODE_ENV
+    #     depends_on:
+    #         - front
 
 # networks:
 #     stack-network: