From: Christian Franke <chris@opensourcerouting.org>
Date: Thu, 18 Oct 2018 10:27:16 +0000 (+0200)
Subject: Docker: really cleanup when TOPOTEST_CLEAN is specified
X-Git-Tag: frr-7.1-dev~144^2~11
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1ab13617bfdf6f15a307345d3ceb3533aaca72bd;p=matthieu%2Ffrr.git

Docker: really cleanup when TOPOTEST_CLEAN is specified

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---

diff --git a/tests/topotests/docker/compile_frr.sh b/tests/topotests/docker/compile_frr.sh
index 6b64f79d60..579994f83d 100755
--- a/tests/topotests/docker/compile_frr.sh
+++ b/tests/topotests/docker/compile_frr.sh
@@ -32,6 +32,11 @@ CDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # Script begin
 #
 
+if [ "${TOPOTEST_CLEAN}" != "0" ]; then
+	log_info "Cleaning FRR builddir..."
+	rm -rf $FRR_SYNC_DIR $FRR_BUILD_DIR &> /dev/null
+fi
+
 log_info "Syncing FRR source with host..."
 mkdir -p $FRR_SYNC_DIR
 rsync -a --info=progress2 \
@@ -52,11 +57,6 @@ else
 	exec 3>/dev/null
 fi
 
-if [ "${TOPOTEST_CLEAN}" != "0" ]; then
-	log_info "Cleaning FRR builddir..."
-	git clean -xdf > /dev/null
-fi
-
 log_info "Building FRR..."
 
 if [ ! -e configure ]; then