<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22132">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jobs: remove duplicate docker_run<br><br>docker_run was duplicated for osmo-e1-hardware and no2bootloader, so the<br>'-e PATH' line could be removed from the global docker_run. It was<br>overriding the PATH, which then did not contain the path to the compiler<br>toolchain anymore.<br><br>This workaround is not needed anymore since de5aa17d6 ('jobs: don't<br>overwrite PATH in "docker run"').<br><br>Related: OS#4911<br>Change-Id: I97a4add17d9fa1bd28ab0ceb054b9a8d948b6f86<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>2 files changed, 0 insertions(+), 55 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/32/22132/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 99bfcce..5447495 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -122,23 +122,6 @@</span><br><span> cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh'</span><br><span> </span><br><span> - osmo-e1-hardware:</span><br><span style="color: hsl(0, 100%, 40%);">- docker_run: |</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%);">- --cap-add SYS_PTRACE \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ARTIFACT_STORE=/artifact_store \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</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 OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e WITH_MANUALS="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 "$ARTIFACT_STORE:/artifact_store" \</span><br><span> docker_img: 'registry.osmocom.org/$USER/fpga-build'</span><br><span> cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh'</span><br><span> </span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index 4b0f621..cab841d 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -202,48 +202,10 @@</span><br><span> ./contrib/jenkins_bts_model.sh "$BTS_MODEL"</span><br><span> </span><br><span> - osmo-e1-hardware:</span><br><span style="color: hsl(0, 100%, 40%);">- docker_run: |</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%);">- --cap-add SYS_PTRACE \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ARTIFACT_STORE=/artifact_store \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</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 OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PUBLISH="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e WITH_MANUALS="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 "$ARTIFACT_STORE:/artifact_store" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span> docker_img: 'registry.osmocom.org/$USER/fpga-build'</span><br><span> cmd: 'docker pull {docker_img} && {docker_run} {docker_img} /build/contrib/jenkins.sh --publish'</span><br><span> - no2bootloader:</span><br><span> git_base_url: github.com/no2fpga</span><br><span style="color: hsl(0, 100%, 40%);">- docker_run: |</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%);">- --cap-add SYS_PTRACE \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ARTIFACT_STORE=/artifact_store \</span><br><span style="color: hsl(0, 100%, 40%);">- -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e HOME=/build \</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 OSMOPY_DEBUG_TCP_SOCKETS="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PARALLEL_MAKE="$PARALLEL_MAKE" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e PUBLISH="1" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e WITH_MANUALS="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 "$ARTIFACT_STORE:/artifact_store" \</span><br><span style="color: hsl(0, 100%, 40%);">- -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span> docker_img: 'registry.osmocom.org/$USER/fpga-build'</span><br><span> cmd: 'docker pull {docker_img} && {docker_run} {docker_img} /build/contrib/jenkins.sh --publish'</span><br><span> email: gerrit-log@lists.osmocom.org laforge@gnumonks.org kredon@sysmocom.de 246tnt@gmail.com</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22132">change 22132</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/+/22132"/><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: I97a4add17d9fa1bd28ab0ceb054b9a8d948b6f86 </div>
<div style="display:none"> Gerrit-Change-Number: 22132 </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>