From 7811e44d8b0ecf76ff29db01598eda1d2c9e70d1 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 31 Jan 2025 12:50:36 +0100
Subject: [PATCH] build: refs #6695 always clean dockers
---
Jenkinsfile | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6b3a1b480..b0c1311df 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -99,8 +99,6 @@ pipeline {
def packageJson = readJSON file: 'package.json'
env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
}
- // sh "docker network rm e2e_default || true"
- // sh 'docker network create e2e_default || true'
sh 'rm -rf salix'
sh 'git clone https://gitea.verdnatura.es/verdnatura/salix.git'
// Db
@@ -117,13 +115,10 @@ pipeline {
sh 'docker-compose -f docker-compose.e2e.yml up e2e'
}
post {
- failure {
- echo 'Removing containers...'
+ always {
sh 'docker rm -f vn-database || true'
sh 'docker rm -f salix_e2e || true'
sh 'docker-compose -f docker-compose.e2e.yml down || true'
- }
- always {
junit(
testResults: 'junitresults.xml',
allowEmptyResults: true