From 229fa070c49cb78c10dfda9e813b3702d9bf6e47 Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Fri, 27 Oct 2017 22:40:30 +0200
Subject: jenkins: use osmo-clean-workspace.sh before and after build

See osmo-ci change I2409b2928b4d7ebbd6c005097d4ad7337307dd93 for rationale.

Depends: I2409b2928b4d7ebbd6c005097d4ad7337307dd93
Change-Id: I99fdd20e7b18c2f4a59a9db35e5efccca6546b77
---
 contrib/jenkins-arm.sh    | 2 ++
 contrib/jenkins.sh        | 2 ++
 contrib/jenkins_common.sh | 9 ++++-----
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'contrib')

diff --git a/contrib/jenkins-arm.sh b/contrib/jenkins-arm.sh
index ef116b12..acdbe3cc 100755
--- a/contrib/jenkins-arm.sh
+++ b/contrib/jenkins-arm.sh
@@ -24,3 +24,5 @@ build() {
 build builddir
 # verify build in source tree
 build .
+
+osmo-clean-workspace.sh
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index d7315040..5798c950 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -29,3 +29,5 @@ build .
 # is well separated from the source tree state.
 $MAKE distcheck \
     || cat-testlogs.sh
+
+osmo-clean-workspace.sh
diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh
index bc4ac65b..a6ffe7f7 100644
--- a/contrib/jenkins_common.sh
+++ b/contrib/jenkins_common.sh
@@ -8,6 +8,8 @@ if [ -z "$MAKE" ]; then
     exit 1
 fi
 
+osmo-clean-workspace.sh
+
 verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
 
 prep_build() {
@@ -16,11 +18,8 @@ prep_build() {
 
     cd "$_src_dir"
 
-    # a failed 'make distcheck' may leave files without write permissions
-    chmod -R a+w .
-    git clean -dxf
-    # make absolutely sure no src files have modifications
-    git checkout -f HEAD
+    # clean again before each build variant
+    osmo-clean-workspace.sh
 
     autoreconf --install --force
 
-- 
cgit v1.2.3