<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/15582">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gerrit, master builds: add docker_{run,img} vars<br><br>Move the common "docker run" invocation and image name into one place,<br>so it is not duplicated over and over. This prepares for changing the<br>image and building all Osmocom projects in docker (follow up patches).<br><br>Related: OS#3726<br>Change-Id: If529e6a93bb2227230981ee22f2c75bd0f1f4518<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>2 files changed, 61 insertions(+), 177 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/82/15582/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 c5aae68..801c793 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -20,6 +20,23 @@</span><br><span> combination_filter: ''</span><br><span> sequential: false</span><br><span> # most common build invocation</span><br><span style="color: hsl(120, 100%, 40%);">+ docker_run: |</span><br><span style="color: hsl(120, 100%, 40%);">+ ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span style="color: hsl(120, 100%, 40%);">+ mkdir -p "$ARTIFACT_STORE"</span><br><span style="color: hsl(120, 100%, 40%);">+ docker run --rm=true \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ARTIFACT_STORE=/artifact_store \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e HOME=/build \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e JOB_NAME="$JOB_NAME" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e MAKE=make \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e WITH_MANUALS="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" -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span style="color: hsl(120, 100%, 40%);">+ docker_img: 'osmocom:amd64'</span><br><span> cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/{repos}'</span><br><span> gerrit_project: '{repos}'</span><br><span>@@ -30,16 +47,7 @@</span><br><span> </span><br><span> - cellmgr-ng:</span><br><span> concurrent: true</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -i -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 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>@@ -67,26 +75,11 @@</span><br><span> a3: !!python/tuple [--disable-iu]</span><br><span> concurrent: true</span><br><span> cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span style="color: hsl(0, 100%, 40%);">- mkdir -p "$ARTIFACT_STORE"</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ARTIFACT_STORE=/artifact_store \</span><br><span style="color: hsl(0, 100%, 40%);">- -e JOB_NAME="$JOB_NAME" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_run} \</span><br><span> -e IU="$IU" \</span><br><span> -e SMPP="$SMPP" \</span><br><span> -e MGCP="$MGCP" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e WITH_MANUALS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -i -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_img} /build/contrib/jenkins.sh</span><br><span> </span><br><span> - openggsn:</span><br><span> a1_name: GTP</span><br><span>@@ -95,18 +88,7 @@</span><br><span> </span><br><span> - osmo-bsc:</span><br><span> concurrent: true</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e WITH_MANUALS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -i -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 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>@@ -148,18 +130,7 @@</span><br><span> </span><br><span> - osmo-mgw:</span><br><span> concurrent: true</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e WITH_MANUALS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -i -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 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>@@ -171,23 +142,10 @@</span><br><span> (IU == "--enable-iu" && WITH_MANUALS == "0") ||</span><br><span> (IU == "--disable-iu" && WITH_MANUALS == "1")</span><br><span> cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span style="color: hsl(0, 100%, 40%);">- mkdir -p "$ARTIFACT_STORE"</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true -i \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ARTIFACT_STORE=/artifact_store \</span><br><span style="color: hsl(0, 100%, 40%);">- -e JOB_NAME="$JOB_NAME" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e IU="$IU" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_run} \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e IU="$IU" \</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-pcap</span><br><span> </span><br><span>@@ -209,19 +167,12 @@</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> cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_run} \</span><br><span> -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \</span><br><span> -e with_vty="$with_vty" \</span><br><span> -e with_dsp="$with_dsp" \</span><br><span> -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -i -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_img} /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>@@ -237,18 +188,10 @@</span><br><span> (IU == "--enable-iu" && WITH_MANUALS == "0") ||</span><br><span> (IU == "--disable-iu" && WITH_MANUALS == "1")</span><br><span> cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_run} \</span><br><span> -e IU="$IU" \</span><br><span> -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -i -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_img} /build/contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-sip-connector:</span><br><span> cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index 9374391..c0d25a6 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -19,6 +19,25 @@</span><br><span> combination_filter: ''</span><br><span> sequential: false</span><br><span> # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs)</span><br><span style="color: hsl(120, 100%, 40%);">+ docker_run: |</span><br><span style="color: hsl(120, 100%, 40%);">+ ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span style="color: hsl(120, 100%, 40%);">+ mkdir -p "$ARTIFACT_STORE"</span><br><span style="color: hsl(120, 100%, 40%);">+ docker run --rm=true \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ARTIFACT_STORE=/artifact_store \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e HOME=/build \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e JOB_NAME="$JOB_NAME" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e MAKE=make \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PARALLEL_MAKE="$PARALLEL_MAKE" \</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 WITH_MANUALS="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" -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v "$ARTIFACT_STORE:/artifact_store" \</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%);">+ docker_img: 'osmocom:amd64'</span><br><span> cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> wrappers: []</span><br><span> trigger:</span><br><span>@@ -144,45 +163,15 @@</span><br><span> a3: !!python/tuple [--disable-iu]</span><br><span> concurrent: true</span><br><span> cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span style="color: hsl(0, 100%, 40%);">- mkdir -p "$ARTIFACT_STORE"</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ARTIFACT_STORE=/artifact_store \</span><br><span style="color: hsl(0, 100%, 40%);">- -e JOB_NAME="$JOB_NAME" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_run} \</span><br><span> -e IU="$IU" \</span><br><span> -e SMPP="$SMPP" \</span><br><span> -e MGCP="$MGCP" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e WITH_MANUALS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PUBLISH="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -i -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_img} /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: |</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e WITH_MANUALS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PUBLISH="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -i -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 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>@@ -240,20 +229,7 @@</span><br><span> </span><br><span> - osmo-mgw:</span><br><span> concurrent: true</span><br><span style="color: hsl(0, 100%, 40%);">- cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e WITH_MANUALS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PUBLISH="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -i -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 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>@@ -266,25 +242,10 @@</span><br><span> (IU == "--enable-iu" && WITH_MANUALS == "0") ||</span><br><span> (IU == "--disable-iu" && WITH_MANUALS == "1")</span><br><span> cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span style="color: hsl(0, 100%, 40%);">- mkdir -p "$ARTIFACT_STORE"</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true -i \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ARTIFACT_STORE=/artifact_store \</span><br><span style="color: hsl(0, 100%, 40%);">- -e JOB_NAME="$JOB_NAME" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e IU="$IU" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PUBLISH="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_run} \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e IU="$IU" \</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-pcap</span><br><span> </span><br><span>@@ -310,22 +271,12 @@</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> cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_run} \</span><br><span> -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \</span><br><span> -e with_vty="$with_vty" \</span><br><span> -e with_dsp="$with_dsp" \</span><br><span> -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PUBLISH="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -i -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_img} /build/contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-sgsn:</span><br><span> a1_name: IU</span><br><span>@@ -337,20 +288,10 @@</span><br><span> (IU == "--enable-iu" && WITH_MANUALS == "0") ||</span><br><span> (IU == "--disable-iu" && WITH_MANUALS == "1")</span><br><span> cmd: |</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MAKE=make \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_run} \</span><br><span> -e IU="$IU" \</span><br><span> -e WITH_MANUALS="$WITH_MANUALS" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PUBLISH="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -i -u build \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:amd64 /build/contrib/jenkins.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ {docker_img} /build/contrib/jenkins.sh</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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/15582">change 15582</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/+/15582"/><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: If529e6a93bb2227230981ee22f2c75bd0f1f4518 </div>
<div style="display:none"> Gerrit-Change-Number: 15582 </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>