Change in osmo-ci[master]: jobs/master-builds.yml: fix osmo-fl2k

[osmith]

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

Change subject: jobs/master-builds.yml: fix osmo-fl2k
......................................................................

jobs/master-builds.yml: fix osmo-fl2k

Don't use the old "osmocom:amd64" image. Remove the entire cmd line, so
it uses the default docker command with the default docker image
"osmocom:deb9_amd64". Also remove concurrent: true, because that default
nowadays too.

Related: OS#3203
Change-Id: I93db12d3652f26db059e0ede52d2b2fdd3e89d34
---
M jobs/master-builds.yml
1 file changed, 1 insertion(+), 11 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified



diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 15acd12..0bd2de7 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -194,17 +194,7 @@
           concurrent: false
           cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'
 
-      - osmo-fl2k:
-          concurrent: true
-          cmd: |
-            docker run --rm=true \
-              -e HOME=/build \
-              -e PARALLEL_MAKE="$PARALLEL_MAKE" \
-              -e PATH="$PATH:/build_bin" \
-              -w /build -i -u build \
-              -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
-              osmocom:amd64 /build/contrib/jenkins.sh
-
+      - osmo-fl2k
       - osmo-ggsn:
           a1_name: GTP
           a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux]

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I93db12d3652f26db059e0ede52d2b2fdd3e89d34
Gerrit-Change-Number: 16399
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191202/1870e800/attachment.htm>