Change in osmo-ci[master]: jobs/master, gerrit: run osmo-{bts, trx} in docker

[osmith]

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23283 )


Change subject: jobs/master,gerrit: run osmo-{bts,trx} in docker
......................................................................

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
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 16 insertions(+), 14 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/83/23283/1

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

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ifc11730192b852d3760a31a561efc61a1a853674
Gerrit-Change-Number: 23283
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210309/f692449b/attachment.htm>