[MERGED] libosmocore[master]: jenkins: use osmo-clean-workspace.sh before and after build

Harald Welte gerrit-no-reply at lists.osmocom.org
Sat Oct 28 15:08:14 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: jenkins: use osmo-clean-workspace.sh before and after build
......................................................................


jenkins: use osmo-clean-workspace.sh before and after build

See osmo-ci change I2409b2928b4d7ebbd6c005097d4ad7337307dd93 for rationale.

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

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/contrib/jenkins-arm.sh b/contrib/jenkins-arm.sh
index ef116b1..acdbe3c 100755
--- a/contrib/jenkins-arm.sh
+++ b/contrib/jenkins-arm.sh
@@ -24,3 +24,5 @@
 build builddir
 # verify build in source tree
 build .
+
+osmo-clean-workspace.sh
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index d731504..5798c95 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -29,3 +29,5 @@
 # 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 bc4ac65..a6ffe7f 100644
--- a/contrib/jenkins_common.sh
+++ b/contrib/jenkins_common.sh
@@ -8,6 +8,8 @@
     exit 1
 fi
 
+osmo-clean-workspace.sh
+
 verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
 
 prep_build() {
@@ -16,11 +18,8 @@
 
     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
 

-- 
To view, visit https://gerrit.osmocom.org/4470
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I99fdd20e7b18c2f4a59a9db35e5efccca6546b77
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder


More information about the gerrit-log mailing list