<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12076">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib/jenkins_*.sh: build and publish manuals<br><br>Add new environment variables WITH_MANUALS and PUBLISH to control if<br>the manuals should be built and uploaded. Describe all environment vars<br>on top of jenkins_bts_model.sh. Change the top description line to look<br>like all the other contrib/jenkins.sh files (from other repositories),<br>so it is clear that this is the entry point of Jenkins (and not the<br>other contrib/jenkins_*.sh scripts).<br><br>When WITH_MANUALS is set, install osmo-gsm-manuals like any other<br>dependency and add --enable-manuals to the configure flags (for "make"<br>and "make distcheck"). Add the bin subdir of the installed files to<br>PATH, so osmo-gsm-manuals-check-depends can be used by ./configure.<br><br>Related: OS#3385<br>Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860<br>---<br>M contrib/jenkins_bts_model.sh<br>M contrib/jenkins_common.sh<br>2 files changed, 23 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins_bts_model.sh b/contrib/jenkins_bts_model.sh</span><br><span>index 9aa943f..ac85c30 100755</span><br><span>--- a/contrib/jenkins_bts_model.sh</span><br><span>+++ b/contrib/jenkins_bts_model.sh</span><br><span>@@ -1,6 +1,14 @@</span><br><span> #!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-# this is a dispatcher script which will call the bts-model-specific</span><br><span style="color: hsl(0, 100%, 40%);">-# script based on the bts model specified as command line argument</span><br><span style="color: hsl(120, 100%, 40%);">+# jenkins build helper script for osmo-bts. This is how we build on jenkins.osmocom.org</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# environment variables:</span><br><span style="color: hsl(120, 100%, 40%);">+# * FIRMWARE_VERSION: which firmware version to build ("master", "femtobts_v2.7", ...)</span><br><span style="color: hsl(120, 100%, 40%);">+# * WITH_MANUALS: build manual PDFs if set to "1"</span><br><span style="color: hsl(120, 100%, 40%);">+# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1")</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# usage: jenkins_bts_model.sh BTS_MODEL</span><br><span style="color: hsl(120, 100%, 40%);">+# * BTS_MODEL: which BTS model specific script to run ("sysmo", "oct", ...)</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span> </span><br><span> bts_model="$1"</span><br><span> </span><br><span>diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh</span><br><span>index bdb12d5..fd0359b 100644</span><br><span>--- a/contrib/jenkins_common.sh</span><br><span>+++ b/contrib/jenkins_common.sh</span><br><span>@@ -38,10 +38,23 @@</span><br><span> osmo-deps.sh libosmocore</span><br><span> cd $base</span><br><span> shift</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Manuals: build</span><br><span> conf_flags="$*"</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "$WITH_MANUALS" = "1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ conf_flags="$conf_flags --enable-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-build-dep.sh osmo-gsm-manuals</span><br><span style="color: hsl(120, 100%, 40%);">+ export PATH="$inst/bin:$PATH"</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 $conf_flags</span><br><span> $MAKE $PARALLEL_MAKE</span><br><span> $MAKE check || cat-testlogs.sh</span><br><span> DISTCHECK_CONFIGURE_FLAGS="$conf_flags" $MAKE distcheck || cat-testlogs.sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Manuals: publish</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ $MAKE -C "$base/doc/manuals" publish</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12076">change 12076</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/12076"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: If51194cc595bd8cf1081b35ab0e1a5ddcd448860 </div>
<div style="display:none"> Gerrit-Change-Number: 12076 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>