<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/15566">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gerrit, master builds: concurrent OsmoPCU builds<br><br>Re-enable concurrent builds for OsmoPCU, and run all builds in<br>docker. This should prevent previous problems with VTY/CTRL test<br>collisions, which lead to the concurrent builds being disabled<br>in I23d5b75825a667e4f043d16a12b841cd8f01af5e.<br><br>Related: OS#4204<br>Change-Id: I4f90a601e41dca18a6fcbab56bdf5663167d2353<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>2 files changed, 33 insertions(+), 3 deletions(-)<br><br></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 abd8090..c5aae68 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -200,7 +200,7 @@</span><br><span> a3: !!python/tuple [sysmo, lc15, oc2g, none]</span><br><span> a4_name: WITH_MANUALS</span><br><span> a4: !!python/tuple ["1", "0"]</span><br><span style="color: hsl(0, 100%, 40%);">- sequential: true</span><br><span style="color: hsl(120, 100%, 40%);">+ concurrent: true</span><br><span> combination_filter: ></span><br><span> (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||</span><br><span> (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||</span><br><span>@@ -208,6 +208,20 @@</span><br><span> (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="litecell15" && WITH_MANUALS == "0") ||</span><br><span> (with_vty == "True" && with_dsp == "oc2g" && FIRMWARE_VERSION=="oc2g" && WITH_MANUALS == "0") ||</span><br><span> (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: |</span><br><span style="color: hsl(120, 100%, 40%);">+ docker run --rm=true \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e HOME=/build \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e MAKE=make \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PARALLEL_MAKE="$PARALLEL_MAKE" \</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_vty="$with_vty" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e with_dsp="$with_dsp" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -w /build -i -u build \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v "$PWD:/build" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-python-tests:</span><br><span> repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/python/{repos}'</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index ed180a4..9374391 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -302,14 +302,30 @@</span><br><span> a3: !!python/tuple [sysmo, lc15, none]</span><br><span> a4_name: WITH_MANUALS</span><br><span> a4: !!python/tuple ["1", "0"]</span><br><span style="color: hsl(0, 100%, 40%);">- sequential: true</span><br><span style="color: hsl(120, 100%, 40%);">+ concurrent: true</span><br><span> combination_filter: ></span><br><span> (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||</span><br><span> (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||</span><br><span> (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") ||</span><br><span> (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") ||</span><br><span> (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: |</span><br><span style="color: hsl(120, 100%, 40%);">+ docker run --rm=true \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e HOME=/build \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e MAKE=make \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PARALLEL_MAKE="$PARALLEL_MAKE" \</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_vty="$with_vty" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e with_dsp="$with_dsp" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PUBLISH="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -w /build -i -u build \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v "$PWD:/build" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-sgsn:</span><br><span> a1_name: IU</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/15566">change 15566</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/+/15566"/><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: I4f90a601e41dca18a6fcbab56bdf5663167d2353 </div>
<div style="display:none"> Gerrit-Change-Number: 15566 </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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>