diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-01-12 14:13:16 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-01-13 12:40:18 +0100 |
| commit | 9dadec320931a782d6301a5466be1add0e1de7cd (patch) | |
| tree | 1b576b10e7d8719abb9bcb3fcb80c35dd8c3165a /jobs | |
| parent | 212e43fa1c5632d8136876f2d7d99c7296fdd767 (diff) | |
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
Diffstat (limited to 'jobs')
| -rw-r--r-- | jobs/gerrit-verifications.yml | 17 | ||||
| -rw-r--r-- | jobs/master-builds.yml | 38 |
2 files changed, 0 insertions, 55 deletions
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@lists.osmocom.org laforge@gnumonks.org kredon@sysmocom.de 246tnt@gmail.com |