From 4b213b078eded01f26c3fefbdc5d937901e97080 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Thu, 7 Mar 2019 10:35:23 +0100
Subject: [PATCH] Jenkinsfile: allocate a TMPDIR et clean it at the end
 (#31192)

---
 Jenkinsfile | 5 +++++
 tox.ini     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ee172a9..79afbf5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,9 +2,13 @@
 
 pipeline {
     agent any
+    environment {
+       TMPDIR = "/tmp/$BUILD_TAG"
+    }
     stages {
         stage('Unit Tests') {
             steps {
+                sh "mkdir -p ${env.TMPDIR}"
                 sh 'tox -rv'
             }
             post {
@@ -35,6 +39,7 @@ pipeline {
                 utils = new Utils()
                 utils.mail_notify(currentBuild, env, 'admin+jenkins-passerelle@entrouvert.com')
             }
+            sh "rm -rf ${env.TMPDIR}"
         }
         success {
             cleanWs()
diff --git a/tox.ini b/tox.ini
index b7fb761..5d2173e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle/{env:BRANCH_NAME:}
+toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle/
 envlist = django{18,111}-{sqlite,pg}
 
 [testenv]
-- 
2.20.1