<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/15584">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
osmith: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gerrit, master builds: build almost all in docker<br><br>Instead of building some projects in docker, and some directly on the<br>build slave, build almost all of them in docker with few exceptions, and<br>make building in docker the default.<br><br>This has several advantages:<br>* build environment of master builds and gerrit verifications is the<br> same, therefore the same build won't pass in gerrit and then fail in<br> master<br>* all build environments are volatile<br>* no more conflicts while running VTY/CTRL tests<br>* fix osmo-python-tests gerrit review versions being installed to<br> /usr/local of build slave (see previous commit message)<br><br>Projects that still do not get built in docker:<br>* openggsn: depends on libgtpnl, but does not build it in jenkins.sh<br>* osmo-bts: l1headers, various SDKs not installed in the docker image<br>* osmo-trx: LimeSuite is not in the docker image (and just installing the<br> debian package does not work)<br>* osmo-ttcn3-hacks: TTCN-3 not installed in docker image<br>* pysim: needs to access real sim cards attached to the host<br>* sysmo-usim-tool: needs to access real sim cards attached to the host<br><br>Related: OS#3726, OS#3598<br>Change-Id: If4b7d2f9ffbc7e92699732d97a8f5829a88c5b35<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>2 files changed, 34 insertions(+), 42 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 693d3c3..83c7169 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -39,7 +39,7 @@</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span> docker_img: 'osmocom:deb9_amd64'</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'</span><br><span> repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/{repos}'</span><br><span> gerrit_project: '{repos}'</span><br><span> </span><br><span>@@ -49,20 +49,18 @@</span><br><span> </span><br><span> - cellmgr-ng:</span><br><span> concurrent: true</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'</span><br><span> </span><br><span> - libasn1c</span><br><span> - libgtpnl</span><br><span> - libosmo-abis</span><br><span> - libosmo-netif</span><br><span style="color: hsl(0, 100%, 40%);">- - libosmo-sccp:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ - libosmo-sccp</span><br><span> </span><br><span> - libosmocore:</span><br><span> a1_name: arch</span><br><span> a1: !!python/tuple [arm-none-eabi, amd64]</span><br><span> combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")'</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: './contrib/jenkins_arch.sh "$arch"'</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: '{docker_run} {docker_img} /build/contrib/jenkins_arch.sh "$arch"'</span><br><span> </span><br><span> - libsmpp34</span><br><span> - libtelnet</span><br><span>@@ -90,7 +88,6 @@</span><br><span> </span><br><span> - osmo-bsc:</span><br><span> concurrent: true</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'</span><br><span> </span><br><span> - osmo-bts:</span><br><span> a1_name: FIRMWARE_VERSION</span><br><span>@@ -120,19 +117,18 @@</span><br><span> combination_filter: ></span><br><span> (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") ||</span><br><span> (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1")</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: 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} \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e GTP="$GTP" \</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> - osmo-gsm-manuals</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- - osmo-hlr:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- - osmo-iuh:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ - osmo-hlr</span><br><span style="color: hsl(120, 100%, 40%);">+ - osmo-iuh</span><br><span> </span><br><span> - osmo-mgw:</span><br><span> concurrent: true</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'</span><br><span> </span><br><span> - osmo-msc:</span><br><span> a1_name: IU</span><br><span>@@ -195,8 +191,7 @@</span><br><span> -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span> {docker_img} /build/contrib/jenkins.sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- - osmo-sip-connector:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ - osmo-sip-connector</span><br><span> </span><br><span> - osmo-trx:</span><br><span> a1_name: INSTR</span><br><span>@@ -208,9 +203,9 @@</span><br><span> concurrent: true</span><br><span> combination_filter: ></span><br><span> (INSTR == "--with-sse" && WITH_MANUALS == "1")</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: 'ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- - osmocom-bb:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ - osmocom-bb</span><br><span> - osmo-tetra</span><br><span> - osmo-sysmon</span><br><span> - osmo-remsim</span><br><span>@@ -222,6 +217,7 @@</span><br><span> </span><br><span> - pysim:</span><br><span> slave_axis: !!python/tuple [simtester]</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: './contrib/jenkins.sh'</span><br><span> </span><br><span> - osmo-ttcn3-hacks:</span><br><span> repos_url: 'https://gerrit.osmocom.org/{repos}'</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index 854b991..138807e 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -18,7 +18,8 @@</span><br><span> a4: !!python/tuple [default]</span><br><span> combination_filter: ''</span><br><span> sequential: false</span><br><span style="color: hsl(0, 100%, 40%);">- # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs)</span><br><span style="color: hsl(120, 100%, 40%);">+ # most common build invocation</span><br><span style="color: hsl(120, 100%, 40%);">+ # PUBLISH=1 is for uploading manual PDFs</span><br><span> # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764)</span><br><span> docker_run: |</span><br><span> ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span>@@ -40,7 +41,7 @@</span><br><span> -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span> -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span> docker_img: 'osmocom:deb9_amd64'</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'</span><br><span> wrappers: []</span><br><span> trigger:</span><br><span> email: jenkins-notifications@lists.osmocom.org laforge@gnumonks.org</span><br><span>@@ -72,10 +73,12 @@</span><br><span> </span><br><span> - libosmo-dsp:</span><br><span> cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- autoreconf --install --force</span><br><span style="color: hsl(0, 100%, 40%);">- ./configure</span><br><span style="color: hsl(0, 100%, 40%);">- $MAKE $PARALLEL_MAKE</span><br><span style="color: hsl(0, 100%, 40%);">- $MAKE distcheck</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_run} \</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_img} sh -ex -c \</span><br><span style="color: hsl(120, 100%, 40%);">+ 'autoreconf -fi; \</span><br><span style="color: hsl(120, 100%, 40%);">+ ./configure; \</span><br><span style="color: hsl(120, 100%, 40%);">+ $MAKE $PARALLEL_MAKE; \</span><br><span style="color: hsl(120, 100%, 40%);">+ $MAKE distcheck'</span><br><span> trigger: master-osmo-gmr</span><br><span> email: gerrit-log@lists.osmocom.org laforge@gnumonks.org 246tnt@gmail.com</span><br><span> </span><br><span>@@ -104,13 +107,12 @@</span><br><span> master-osmo-iuh,</span><br><span> master-osmo-msc,</span><br><span> master-osmo-sgsn</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - libosmocore:</span><br><span> a1_name: arch</span><br><span> a1: !!python/tuple [arm-none-eabi, amd64]</span><br><span> combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")'</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: './contrib/jenkins_arch.sh "$arch"'</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: '{docker_run} {docker_img} /build/contrib/jenkins_arch.sh "$arch"'</span><br><span> # Full triggers would be:</span><br><span> # trigger: ></span><br><span> # master-libosmo-abis, master-libosmo-netif, master-libosmo-sccp, master-openbsc,</span><br><span>@@ -173,7 +175,6 @@</span><br><span> </span><br><span> - osmo-bsc:</span><br><span> concurrent: true</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'</span><br><span> </span><br><span> - osmo-bts:</span><br><span> a1_name: FIRMWARE_VERSION</span><br><span>@@ -202,7 +203,11 @@</span><br><span> combination_filter: ></span><br><span> (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") ||</span><br><span> (GTP == "--disable-gtp-linux" && 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} \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e GTP="$GTP" \</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> trigger: master-osmo-sgsn</span><br><span> </span><br><span> - osmo-gmr:</span><br><span>@@ -210,17 +215,13 @@</span><br><span> </span><br><span> - osmo-gsm-manuals:</span><br><span> node: 'osmocom-master-debian9'</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-gsm-tester:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: PUBLISH=1 ./contrib/jenkins-build-manuals.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: '{docker_run} {docker_img} /build/contrib/jenkins-build-manuals.sh'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- - osmo-hlr:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ - osmo-hlr</span><br><span> </span><br><span> - osmo-iuh:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh</span><br><span> # Full triggers would be:</span><br><span> # trigger: master-osmo-msc, master-osmo-sgsn</span><br><span> # Optimized:</span><br><span>@@ -231,7 +232,6 @@</span><br><span> </span><br><span> - osmo-mgw:</span><br><span> concurrent: true</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'</span><br><span> trigger: master-osmo-msc, master-osmo-bsc</span><br><span> </span><br><span> - osmo-msc:</span><br><span>@@ -297,7 +297,6 @@</span><br><span> </span><br><span> - osmo-sip-connector:</span><br><span> email: gerrit-log@lists.osmocom.org laforge@gnumonks.org holger@freyther.de</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-tetra:</span><br><span> email: gerrit-log@lists.osmocom.org laforge@gnumonks.org 246tnt@gmail.com</span><br><span>@@ -312,17 +311,14 @@</span><br><span> concurrent: true</span><br><span> combination_filter: ></span><br><span> (INSTR == "--with-sse" && 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: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- - osmocom-bb:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ - osmocom-bb</span><br><span> - osmo-sysmon</span><br><span> - osmo-remsim</span><br><span> - osmo-asf4-dfu</span><br><span> - simtrace2:</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- ./contrib/jenkins.sh --publish</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish'</span><br><span> email: gerrit-log@lists.osmocom.org laforge@gnumonks.org kredon@sysmocom.de</span><br><span> </span><br><span> - gapk</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/15584">change 15584</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/+/15584"/><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: If4b7d2f9ffbc7e92699732d97a8f5829a88c5b35 </div>
<div style="display:none"> Gerrit-Change-Number: 15584 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>