[MERGED] osmo-gsm-tester[master]: jenkins-build-common.sh: cosmetic: clear repos a bit later

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Fri Jun 23 02:09:10 UTC 2017


Neels Hofmeyr has submitted this change and it was merged.

Change subject: jenkins-build-common.sh: cosmetic: clear repos a bit later
......................................................................


jenkins-build-common.sh: cosmetic: clear repos a bit later

If we rm -rf * and then checkout a branch, the log prints the entire file tree
as deleted. Instead, rm just before the git reset --hard, which avoids the
extra output.

Change-Id: Ib5b28a82f05d941eae8f3a2f468ef1e9d67e6180
---
M contrib/jenkins-build-common.sh
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh
index 63e0ba8..779f965 100644
--- a/contrib/jenkins-build-common.sh
+++ b/contrib/jenkins-build-common.sh
@@ -77,7 +77,6 @@
     git clone "$git_url/$repo" "$repo"
   fi
   cd "$repo"
-  rm -rf *
   git fetch origin
 
   # Figure out whether we need to prepend origin/ to find branches in upstream
@@ -87,6 +86,7 @@
 
   git branch -D build_branch || true
   git checkout -b build_branch "$branch"
+  rm -rf *
   git reset --hard "$branch"
 
   git rev-parse HEAD

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5b28a82f05d941eae8f3a2f468ef1e9d67e6180
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>



More information about the gerrit-log mailing list