<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12047">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: gerrit-verifications: format docker cmd<br><br>Format the docker command lines just like they are formatted in<br>master-builds.yml. Most notably, this puts every environment variable on<br>its own line. This makes it much easier to compare both files side by<br>side.<br><br>Change-Id: I0adcb028be24c2e05189c15b85811777d6287387<br>---<br>M jobs/gerrit-verifications.yml<br>1 file changed, 61 insertions(+), 22 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/47/12047/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 71a0904..e70d28e 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -32,9 +32,14 @@</span><br><span> concurrent: true</span><br><span> cmd: ></span><br><span> # keep first line with less indent to preserve newlines</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" -w /build \</span><br><span style="color: hsl(0, 100%, 40%);">- -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</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 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> osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span> - libasn1c</span><br><span>@@ -64,11 +69,21 @@</span><br><span> # keep first line with less indent to preserve newlines</span><br><span> ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span> mkdir -p "$ARTIFACT_STORE"</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true -e HOME=/build -e ARTIFACT_STORE=/artifact_store \</span><br><span style="color: hsl(0, 100%, 40%);">- -e JOB_NAME="$JOB_NAME" -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e IU="$IU" -e SMPP="$SMPP" -e MGCP="$MGCP" -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build -i -u build -v "$PWD:/build" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/bin:/build_bin" -v "$ARTIFACT_STORE:/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 HOME=/build \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ARTIFACT_STORE=/artifact_store \</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 PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e IU="$IU" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e SMPP="$SMPP" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e MGCP="$MGCP" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e OSMOPY_DEBUG_TCP_SOCKETS="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 "$ARTIFACT_STORE:/artifact_store" \</span><br><span> osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span> - openggsn:</span><br><span>@@ -80,10 +95,15 @@</span><br><span> concurrent: true</span><br><span> cmd: ></span><br><span> # keep first line with less indent to preserve newlines</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -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 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 PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e OSMOPY_DEBUG_TCP_SOCKETS="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%);">+ osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-bts:</span><br><span> a1_name: FIRMWARE_VERSION</span><br><span>@@ -120,9 +140,15 @@</span><br><span> concurrent: true</span><br><span> cmd: ></span><br><span> # keep first line with less indent to preserve newlines</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e MGCP="$MGCP" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build \</span><br><span style="color: hsl(0, 100%, 40%);">- -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</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 MGCP="$MGCP" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e OSMOPY_DEBUG_TCP_SOCKETS="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> osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-msc:</span><br><span>@@ -133,10 +159,17 @@</span><br><span> # keep first line with less indent to preserve newlines</span><br><span> ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span> mkdir -p "$ARTIFACT_STORE"</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true -i -e HOME=/build -e ARTIFACT_STORE=/artifact_store \</span><br><span style="color: hsl(0, 100%, 40%);">- -e JOB_NAME="$JOB_NAME" -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e IU="$IU" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -w /build -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ docker run --rm=true -i \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e HOME=/build \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e ARTIFACT_STORE=/artifact_store \</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 PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e IU="$IU" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -w /build -u build \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span> osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span>@@ -167,9 +200,15 @@</span><br><span> concurrent: true</span><br><span> cmd: ></span><br><span> # keep first line with less indent to preserve newlines</span><br><span style="color: hsl(0, 100%, 40%);">- docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e IU="$IU" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build \</span><br><span style="color: hsl(0, 100%, 40%);">- -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</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 IU="$IU" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e PATH="$PATH:/build_bin" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e OSMOPY_DEBUG_TCP_SOCKETS="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> osmocom:amd64 /build/contrib/jenkins.sh</span><br><span> </span><br><span> - osmo-sip-connector</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12047">change 12047</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/12047"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0adcb028be24c2e05189c15b85811777d6287387 </div>
<div style="display:none"> Gerrit-Change-Number: 12047 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>