diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-03-09 08:53:15 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-03-09 09:30:27 +0100 |
| commit | 463a6cc0129dacafc100c2b4fb4fc31e669d5337 (patch) | |
| tree | 96ee0d53e3353e4a87bb45d7ee8e6753bd11d917 /jobs | |
| parent | 796fd16b3089a20e696609c8ffcf0f9767504304 (diff) | |
jobs/master,gerrit: run osmo-{bts,trx} in docker
Build both of them in docker, like most other projects.
Depends: docker-playground Ieec31fd6a2034c4430be81afd1d370816cd577d5
Related: OS#5055
Change-Id: Ifc11730192b852d3760a31a561efc61a1a853674
Diffstat (limited to 'jobs')
| -rw-r--r-- | jobs/gerrit-verifications.yml | 14 | ||||
| -rw-r--r-- | jobs/master-builds.yml | 16 |
2 files changed, 16 insertions, 14 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index fbc3b5b..8efce77 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -112,9 +112,10 @@ (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") concurrent: false cmd: | - export ASCIIDOC_WARNINGS_CHECK="1" - export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals" - {timeout_cmd} ./contrib/jenkins_bts_model.sh "$BTS_MODEL" + {docker_run} \ + -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \ + -e WITH_MANUALS="$WITH_MANUALS" \ + {docker_img} {timeout_cmd} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL" - osmo_dia2gsup: repos_url: '{gerrit_url}/erlang/{repos}' @@ -229,9 +230,10 @@ (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-raspbian10") || (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian10") cmd: | - export ASCIIDOC_WARNINGS_CHECK=1 - export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals" - {timeout_cmd} ./contrib/jenkins.sh + {docker_run} \ + -e INSTR="$INSTR" \ + -e WITH_MANUALS="$WITH_MANUALS" \ + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmocom-bb - osmo-tetra diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index fd99c85..22fcf15 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -198,10 +198,10 @@ (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") concurrent: false cmd: | - export ASCIIDOC_WARNINGS_CHECK=1 - export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals" - export PUBLISH=1 - ./contrib/jenkins_bts_model.sh "$BTS_MODEL" + {docker_run} \ + -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \ + -e WITH_MANUALS="$WITH_MANUALS" \ + {docker_img} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL" - osmo-e1-hardware: docker_img: 'registry.osmocom.org/$USER/fpga-build' @@ -324,10 +324,10 @@ (INSTR == "--with-neon" && WITH_MANUALS == "0" && label == "rpi4-raspbian10") || (INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label == "rpi4-raspbian10") cmd: | - export ASCIIDOC_WARNINGS_CHECK=1 - export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals" - export PUBLISH=1 - ./contrib/jenkins.sh + {docker_run} \ + -e INSTR="$INSTR" \ + -e WITH_MANUALS="$WITH_MANUALS" \ + {docker_img} /build/contrib/jenkins.sh - osmocom-bb - osmo-sysmon |