<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/15584">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gerrit, master builds: build everything in docker<br><br>Instead of building some projects in docker, and some directly on the<br>build slave, build all of them in docker.<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><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, 59 insertions(+), 46 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/84/15584/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 3a74dd9..0b05e8b 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -37,7 +37,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>@@ -47,20 +47,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} osmocom:amd64 /build/contrib/jenkins_arch.sh "$arch"'</span><br><span> </span><br><span>       - libsmpp34</span><br><span>       - libtelnet</span><br><span>@@ -84,11 +82,13 @@</span><br><span>       - openggsn:</span><br><span>           a1_name: GTP</span><br><span>           a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux]</span><br><span style="color: hsl(0, 100%, 40%);">-          cmd: ./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%);">+              osmocom:amd64 /build/contrib/jenkins.sh</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>@@ -108,7 +108,11 @@</span><br><span>             (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span>             (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") ||</span><br><span>             (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")</span><br><span style="color: hsl(0, 100%, 40%);">-          cmd: 'ASCIIDOC_WARNINGS_CHECK="1" ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'</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 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%);">+              osmocom:amd64 /build/contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span> </span><br><span>       - osmo-ggsn:</span><br><span>           a1_name: GTP</span><br><span>@@ -118,19 +122,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%);">+              osmocom:amd64 /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>@@ -193,8 +196,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>@@ -206,9 +208,13 @@</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: |</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%);">+              osmocom:amd64 /build/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>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index c56f93f..f952ac2 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -18,7 +18,7 @@</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 (PUBLISH=1: publish manual PDFs)</span><br><span>     docker_run: |</span><br><span>             ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span>             mkdir -p "$ARTIFACT_STORE"</span><br><span>@@ -38,7 +38,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>@@ -70,10 +70,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%);">+              osmocom:amd64 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>@@ -102,13 +104,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} osmocom:amd64 /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>@@ -171,7 +172,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>@@ -190,7 +190,11 @@</span><br><span>             (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span>             (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span>             (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")</span><br><span style="color: hsl(0, 100%, 40%);">-          cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'</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 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%);">+              osmocom:amd64 /build/contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span> </span><br><span>       - osmo-ggsn:</span><br><span>           a1_name: GTP</span><br><span>@@ -200,7 +204,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%);">+              osmocom:amd64 /build/contrib/jenkins.sh</span><br><span>           trigger: master-osmo-sgsn</span><br><span> </span><br><span>       - osmo-gmr:</span><br><span>@@ -208,17 +216,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} osmocom:amd64 /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>@@ -229,7 +233,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>@@ -295,7 +298,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>@@ -310,17 +312,18 @@</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: |</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%);">+              osmocom:amd64 /build/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} osmocom:amd64 /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>@@ -329,7 +332,11 @@</span><br><span>           email: laforge@gnumonks.org steve@steve-m.de</span><br><span> </span><br><span>       - sysmo-usim-tool:</span><br><span style="color: hsl(0, 100%, 40%);">-          cmd: cd ./tests; ./run-tests</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%);">+              osmocom:amd64 sh -ex -c \</span><br><span style="color: hsl(120, 100%, 40%);">+                "cd ./tests; \</span><br><span style="color: hsl(120, 100%, 40%);">+                 ./run-tests"</span><br><span>           slave_axis: !!python/tuple [simtester]</span><br><span>           git_base_url: git.sysmocom.de</span><br><span> </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: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>