From 13eaaa36443c7daacae09d11815243b318557ad0 Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Mon, 2 Dec 2019 09:51:58 +0100
Subject: 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
---
 jobs/master-builds.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'jobs')

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]
-- 
cgit v1.2.3