<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22095">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-build-dep.sh: don't build osmo-gsm-manuals<br><br>Save time by only cloning the repository, and not running autoreconf<br>-fi, ./configure, make and make install. Especially the tests during<br>make took up significant time, that slowed every project depending on<br>osmo-gsm-manuals down while being built through master-builds or<br>gerrit-verifications jobs. Set OSMO_GSM_MANUALS_DIR to the clone<br>location.<br><br>I've considered cloning osmo-gsm-manuals.git in the Dockerfile of<br>debian-stretch-jenkins instead, and removing the call to<br>"osmo-build-dep.sh osmo-gsm-manuals" in each repository. But adjusting<br>osmo-build-dep.sh was less effort to implement.<br><br>Make sure to update the jenkins jobs from jobs/*.yml when merging (or<br>let me do it).<br><br>Change-Id: I5238cf3f93ded97ed2b44d27868123a646e122dc<br>Related: OS#4912<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>M scripts/osmo-build-dep.sh<br>3 files changed, 9 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/95/22095/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml</span><br><span>index a2f75ce..32a81f3 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -34,6 +34,7 @@</span><br><span>               -e JOB_NAME="$JOB_NAME" \</span><br><span>               -e MAKE=make \</span><br><span>               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \</span><br><span>               -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span>               -e PATH="$PATH:/build_bin" \</span><br><span>               -e WITH_MANUALS="1" \</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index cdd3773..93d2e75 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -33,6 +33,7 @@</span><br><span>               -e JOB_NAME="$JOB_NAME" \</span><br><span>               -e MAKE=make \</span><br><span>               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \</span><br><span>               -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span>               -e PATH="$PATH:/build_bin" \</span><br><span>               -e PUBLISH="1" \</span><br><span>diff --git a/scripts/osmo-build-dep.sh b/scripts/osmo-build-dep.sh</span><br><span>index 7013414..c7c4c2a 100755</span><br><span>--- a/scripts/osmo-build-dep.sh</span><br><span>+++ b/scripts/osmo-build-dep.sh</span><br><span>@@ -54,6 +54,13 @@</span><br><span>       cd "$subdir"</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# osmo-gsm-manuals: save time by only cloning the repository (OS#4912).</span><br><span style="color: hsl(120, 100%, 40%);">+# Projects depending on osmo-gsm-manuals can still build the manuals, because</span><br><span style="color: hsl(120, 100%, 40%);">+# we set OSMO_GSM_MANUALS_DIR to the clone destination.</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "$project" = "osmo-gsm-manuals" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+   exit 0</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> autoreconf --install --force</span><br><span> ./configure --prefix="$inst/stow/$project" --with-systemdsystemunitdir="$inst/stow/$project/lib/systemd/system" $cfg</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22095">change 22095</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/+/22095"/><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: I5238cf3f93ded97ed2b44d27868123a646e122dc </div>
<div style="display:none"> Gerrit-Change-Number: 22095 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>