<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/23283">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jobs/master,gerrit: run osmo-{bts,trx} in docker<br><br>Build both of them in docker, like most other projects.<br><br>Depends: docker-playground Ieec31fd6a2034c4430be81afd1d370816cd577d5<br>Related: OS#5055<br>Change-Id: Ifc11730192b852d3760a31a561efc61a1a853674<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>2 files changed, 16 insertions(+), 14 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/83/23283/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 fbc3b5b..8efce77 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -112,9 +112,10 @@</span><br><span>             (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9")</span><br><span>           concurrent: false</span><br><span>           cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">-            export ASCIIDOC_WARNINGS_CHECK="1"</span><br><span style="color: hsl(0, 100%, 40%);">-            export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"</span><br><span style="color: hsl(0, 100%, 40%);">-            {timeout_cmd} ./contrib/jenkins_bts_model.sh "$BTS_MODEL"</span><br><span style="color: hsl(120, 100%, 40%);">+            {docker_run} \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(120, 100%, 40%);">+              {docker_img} {timeout_cmd} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL"</span><br><span> </span><br><span>       - osmo_dia2gsup:</span><br><span>           repos_url: '{gerrit_url}/erlang/{repos}'</span><br><span>@@ -229,9 +230,10 @@</span><br><span>             (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-raspbian10") ||</span><br><span>             (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian10")</span><br><span>           cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">-            export ASCIIDOC_WARNINGS_CHECK=1</span><br><span style="color: hsl(0, 100%, 40%);">-            export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"</span><br><span style="color: hsl(0, 100%, 40%);">-            {timeout_cmd} ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+            {docker_run} \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e INSTR="$INSTR" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(120, 100%, 40%);">+              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh</span><br><span> </span><br><span>       - osmocom-bb</span><br><span>       - osmo-tetra</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index fd99c85..22fcf15 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -198,10 +198,10 @@</span><br><span>             (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9")</span><br><span>           concurrent: false</span><br><span>           cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">-            export ASCIIDOC_WARNINGS_CHECK=1</span><br><span style="color: hsl(0, 100%, 40%);">-            export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"</span><br><span style="color: hsl(0, 100%, 40%);">-            export PUBLISH=1</span><br><span style="color: hsl(0, 100%, 40%);">-            ./contrib/jenkins_bts_model.sh "$BTS_MODEL"</span><br><span style="color: hsl(120, 100%, 40%);">+            {docker_run} \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(120, 100%, 40%);">+              {docker_img} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL"</span><br><span> </span><br><span>       - osmo-e1-hardware:</span><br><span>           docker_img: 'registry.osmocom.org/$USER/fpga-build'</span><br><span>@@ -324,10 +324,10 @@</span><br><span>             (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-raspbian10") ||</span><br><span>             (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian10")</span><br><span>           cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">-            export ASCIIDOC_WARNINGS_CHECK=1</span><br><span style="color: hsl(0, 100%, 40%);">-            export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"</span><br><span style="color: hsl(0, 100%, 40%);">-            export PUBLISH=1</span><br><span style="color: hsl(0, 100%, 40%);">-            ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+            {docker_run} \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e INSTR="$INSTR" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(120, 100%, 40%);">+              {docker_img} /build/contrib/jenkins.sh</span><br><span> </span><br><span>       - osmocom-bb</span><br><span>       - osmo-sysmon</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/23283">change 23283</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/+/23283"/><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: Ifc11730192b852d3760a31a561efc61a1a853674 </div>
<div style="display:none"> Gerrit-Change-Number: 23283 </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>