From a39dab4b7c4c2084a5e690c9bd8e2d9379d00273 Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Fri, 27 Oct 2017 22:54:25 +0200
Subject: [PATCH] jenkins: use osmo-clean-workspace.sh before and after build

See osmo-ci change I2409b2928b4d7ebbd6c005097d4ad7337307dd93 for rationale.

Depends: I2409b2928b4d7ebbd6c005097d4ad7337307dd93
Change-Id: I830b17462b636e0bf03f4d88000660409503c3e5
---
 contrib/jenkins_bts_trx.sh         | 2 ++
 contrib/jenkins_common.sh          | 3 ++-
 contrib/jenkins_lc15.sh            | 2 ++
 contrib/jenkins_oct.sh             | 2 ++
 contrib/jenkins_oct_and_bts_trx.sh | 2 ++
 contrib/jenkins_sysmobts.sh        | 2 ++
 6 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/contrib/jenkins_bts_trx.sh b/contrib/jenkins_bts_trx.sh
index 47ccde383..9a181f2d3 100755
--- a/contrib/jenkins_bts_trx.sh
+++ b/contrib/jenkins_bts_trx.sh
@@ -22,3 +22,5 @@ configure_flags="\
   "
 
 build_bts "osmo-bts-trx" "$configure_flags"
+
+osmo-clean-workspace.sh
diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh
index d4c3b1a72..cc1b5b3cb 100644
--- a/contrib/jenkins_common.sh
+++ b/contrib/jenkins_common.sh
@@ -17,8 +17,9 @@ inst="$deps/install"
 
 export deps inst
 
+osmo-clean-workspace.sh
+
 mkdir -p "$deps"
-rm -rf "$inst"
 
 verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
 
diff --git a/contrib/jenkins_lc15.sh b/contrib/jenkins_lc15.sh
index 314d85c0f..feef3027c 100755
--- a/contrib/jenkins_lc15.sh
+++ b/contrib/jenkins_lc15.sh
@@ -17,3 +17,5 @@ osmo-layer1-headers.sh lc15 "$FIRMWARE_VERSION"
 configure_flags="--with-litecell15=$deps/layer1-headers/inc/ --enable-litecell15"
 
 build_bts "osmo-bts-lc15" "$configure_flags"
+
+osmo-clean-workspace.sh
diff --git a/contrib/jenkins_oct.sh b/contrib/jenkins_oct.sh
index 8a351c534..1e139afa2 100755
--- a/contrib/jenkins_oct.sh
+++ b/contrib/jenkins_oct.sh
@@ -17,3 +17,5 @@ osmo-layer1-headers.sh oct "$FIRMWARE_VERSION"
 configure_flags="--with-octsdr-2g=$deps/layer1-headers/ --enable-octphy"
 
 build_bts "osmo-bts-octphy" "$configure_flags"
+
+osmo-clean-workspace.sh
diff --git a/contrib/jenkins_oct_and_bts_trx.sh b/contrib/jenkins_oct_and_bts_trx.sh
index 964fb94fb..ac8ef6d7f 100755
--- a/contrib/jenkins_oct_and_bts_trx.sh
+++ b/contrib/jenkins_oct_and_bts_trx.sh
@@ -26,3 +26,5 @@ configure_flags="\
   "
 
 build_bts "osmo-bts-octphy+trx" "$configure_flags"
+
+osmo-clean-workspace.sh
diff --git a/contrib/jenkins_sysmobts.sh b/contrib/jenkins_sysmobts.sh
index ca12e761c..d7caf0fe5 100755
--- a/contrib/jenkins_sysmobts.sh
+++ b/contrib/jenkins_sysmobts.sh
@@ -24,3 +24,5 @@ build_bts "osmo-bts-sysmo" "$configure_flags"
 if [ $FIRMWARE_VERSION != "femtobts_v2.7" ]; then
   $MAKE -C contrib/sysmobts-calib
 fi
+
+osmo-clean-workspace.sh