From a1364c653c6d15934e0718a570438a3939995b67 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Mon, 18 Feb 2019 08:55:58 +0100
Subject: [PATCH] Jenkinsfile fixes

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3d4fc2caa..30b549181 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,6 +6,7 @@ pipeline {
         disableConcurrentBuilds()
     }
     environment {
+        PROJECT_NAME = 'salix'
         REGISTRY = 'registry.verdnatura.es'
         DOCKER_HOST_1 = 'vch1.verdnatura.es'
         DOCKER_HOST_2 = 'vch2.verdnatura.es'
@@ -15,7 +16,7 @@ pipeline {
         stage('Checkout') {
             steps {
                 script {
-                    env.COMPOSE_PROJECT_NAME = env.JOB_NAME.replace('/', '-')
+                    env.COMPOSE_PROJECT_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
                     env.GIT_COMMITTER_EMAIL = sh(
                         script: 'git --no-pager show -s --format="%ae"',
                         returnStdout: true