<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/16561">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
osmith: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: clone from gerrit.osmocom.org<br><br>Work around "garbage at end of loose object" errors that occasionally<br>cause these jenkins jobs to fail.<br><br>A few repositories are not hosted on gerrit, so they still get cloned<br>from git.osmocom.org. However, having almost all repositories cloned from<br>gerrit should improve the situation a lot.<br><br>Related: OS#4083<br>Change-Id: Id8f08a1bc10d6c81be9ad44c60646e2ea9f6cf4e<br>---<br>M scripts/common.sh<br>M scripts/osmocom-latest-packages.sh<br>M scripts/osmocom-nightly-packages.sh<br>3 files changed, 20 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/common.sh b/scripts/common.sh</span><br><span>index 340bac8..1c2dfe0 100644</span><br><span>--- a/scripts/common.sh</span><br><span>+++ b/scripts/common.sh</span><br><span>@@ -1,6 +1,7 @@</span><br><span> #!/bin/sh</span><br><span> # Various functions and variables used in multiple osmo-ci shell scripts</span><br><span> OSMO_GIT_URL="https://git.osmocom.org"</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GIT_URL_GERRIT="https://gerrit.osmocom.org"</span><br><span> </span><br><span> # Osmocom repositories of which we want to build release tarballs automatically, and list the current versions at</span><br><span> # https://jenkins.osmocom.org/jenkins/job/Osmocom-list-commits/lastSuccessfulBuild/artifact/commits.txt</span><br><span>@@ -99,6 +100,20 @@</span><br><span> fi</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Print git clone URL for an Osmocom git repository. Prefer the gerrit clone URL, because cloning from the regular URL</span><br><span style="color: hsl(120, 100%, 40%);">+# sometimes results in the "garbage at end of loose object" error (OS#4083).</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: Osmocom project (e.g. "osmo-hlr")</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_git_clone_url() {</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$1" in</span><br><span style="color: hsl(120, 100%, 40%);">+ rtl-sdr|osmo-fl2k|libosmo-dsp|libgtpnl|libasn1c|libusrp|libsmpp34)</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$OSMO_GIT_URL"/"$1"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *)</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$OSMO_GIT_URL_GERRIT"/"$1"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Print the subdirectory of the repository where the source lies (configure.ac etc.).</span><br><span> # Print nothing when the source is in the topdir of the repository.</span><br><span> osmo_source_subdir() {</span><br><span>diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh</span><br><span>index 509bced..3770ee1 100755</span><br><span>--- a/scripts/osmocom-latest-packages.sh</span><br><span>+++ b/scripts/osmocom-latest-packages.sh</span><br><span>@@ -55,7 +55,7 @@</span><br><span> if [ "$project" = "limesuite" ]; then</span><br><span> [ -d "$project" ] || git clone "https://github.com/myriadrf/LimeSuite" "$project"</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- [ -d "$project" ] || osmo_git_clone_date "https://git.osmocom.org/$project"</span><br><span style="color: hsl(120, 100%, 40%);">+ [ -d "$project" ] || osmo_git_clone_date "$(osmo_git_clone_url "$project")"</span><br><span> fi</span><br><span> cd "$project"</span><br><span> git fetch</span><br><span>@@ -131,6 +131,7 @@</span><br><span> build_osmocom() {</span><br><span> prepare</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # NOTE: when adding a repository that is not in gerrit, adjust osmo_git_clone_url()</span><br><span> checkout limesuite</span><br><span> checkout osmo-gsm-manuals</span><br><span> checkout libosmocore</span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index 1c76cc1..d49d968 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -64,14 +64,13 @@</span><br><span> checkout() {</span><br><span> local name=$1</span><br><span> local branch=$2</span><br><span style="color: hsl(0, 100%, 40%);">- local url="https://git.osmocom.org"</span><br><span> </span><br><span> cd "$REPO"</span><br><span> </span><br><span> if [ -n "$branch" ] ; then</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_git_clone_date "$url/$name" -b "$branch"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_git_clone_date "$(osmo_git_clone_url "$name")" -b "$branch"</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_git_clone_date "$url/$name"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_git_clone_date "$(osmo_git_clone_url "$name")"</span><br><span> fi</span><br><span> </span><br><span> cd -</span><br><span>@@ -177,6 +176,7 @@</span><br><span> </span><br><span> prepare</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # NOTE: when adding a repository that is not in gerrit, adjust osmo_git_clone_url()</span><br><span> checkout_limesuite</span><br><span> checkout osmo-gsm-manuals</span><br><span> checkout libosmocore</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/16561">change 16561</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ci/+/16561"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id8f08a1bc10d6c81be9ad44c60646e2ea9f6cf4e </div>
<div style="display:none"> Gerrit-Change-Number: 16561 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>