Change in osmo-ci[master]: jobs: remove duplicate docker_run

[osmith]

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22132 )

Change subject: jobs: remove duplicate docker_run
......................................................................

jobs: remove duplicate docker_run

docker_run was duplicated for osmo-e1-hardware and no2bootloader, so the
'-e PATH' line could be removed from the global docker_run. It was
overriding the PATH, which then did not contain the path to the compiler
toolchain anymore.

This workaround is not needed anymore since de5aa17d6 ('jobs: don't
overwrite PATH in "docker run"').

Related: OS#4911
Change-Id: I97a4add17d9fa1bd28ab0ceb054b9a8d948b6f86
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 0 insertions(+), 55 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved; Verified



diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 99bfcce..5447495 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -122,23 +122,6 @@
           cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh'
 
       - osmo-e1-hardware:
-          docker_run: |
-            ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
-            mkdir -p "$ARTIFACT_STORE"
-            docker run --rm=true \
-              --cap-add SYS_PTRACE \
-              -e ARTIFACT_STORE=/artifact_store \
-              -e ASCIIDOC_WARNINGS_CHECK="1" \
-              -e HOME=/build \
-              -e JOB_NAME="$JOB_NAME" \
-              -e MAKE=make \
-              -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
-              -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
-              -e PARALLEL_MAKE="$PARALLEL_MAKE" \
-              -e WITH_MANUALS="1" \
-              -w /build -i -u build \
-              -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
-              -v "$ARTIFACT_STORE:/artifact_store" \
           docker_img: 'registry.osmocom.org/$USER/fpga-build'
           cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh'
 
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 4b0f621..cab841d 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -202,48 +202,10 @@
             ./contrib/jenkins_bts_model.sh "$BTS_MODEL"
 
       - osmo-e1-hardware:
-          docker_run: |
-            ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
-            mkdir -p "$ARTIFACT_STORE"
-            docker run --rm=true \
-              --cap-add SYS_PTRACE \
-              -e ARTIFACT_STORE=/artifact_store \
-              -e ASCIIDOC_WARNINGS_CHECK="1" \
-              -e HOME=/build \
-              -e JOB_NAME="$JOB_NAME" \
-              -e MAKE=make \
-              -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
-              -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
-              -e PARALLEL_MAKE="$PARALLEL_MAKE" \
-              -e PUBLISH="1" \
-              -e WITH_MANUALS="1" \
-              -w /build -i -u build \
-              -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
-              -v "$ARTIFACT_STORE:/artifact_store" \
-              -v "$HOME/.ssh:/home/build/.ssh:ro" \
           docker_img: 'registry.osmocom.org/$USER/fpga-build'
           cmd: 'docker pull {docker_img} && {docker_run} {docker_img} /build/contrib/jenkins.sh --publish'
       - no2bootloader:
           git_base_url: github.com/no2fpga
-          docker_run: |
-            ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
-            mkdir -p "$ARTIFACT_STORE"
-            docker run --rm=true \
-              --cap-add SYS_PTRACE \
-              -e ARTIFACT_STORE=/artifact_store \
-              -e ASCIIDOC_WARNINGS_CHECK="1" \
-              -e HOME=/build \
-              -e JOB_NAME="$JOB_NAME" \
-              -e MAKE=make \
-              -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
-              -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
-              -e PARALLEL_MAKE="$PARALLEL_MAKE" \
-              -e PUBLISH="1" \
-              -e WITH_MANUALS="1" \
-              -w /build -i -u build \
-              -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
-              -v "$ARTIFACT_STORE:/artifact_store" \
-              -v "$HOME/.ssh:/home/build/.ssh:ro" \
           docker_img: 'registry.osmocom.org/$USER/fpga-build'
           cmd: 'docker pull {docker_img} && {docker_run} {docker_img} /build/contrib/jenkins.sh --publish'
           email: gerrit-log at lists.osmocom.org laforge at gnumonks.org kredon at sysmocom.de 246tnt at gmail.com

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22132
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I97a4add17d9fa1bd28ab0ceb054b9a8d948b6f86
Gerrit-Change-Number: 22132
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210113/74611181/attachment.htm>