diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2019-12-02 09:51:58 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2019-12-02 09:54:56 +0100 |
| commit | 13eaaa36443c7daacae09d11815243b318557ad0 (patch) | |
| tree | 77649d35cac067b4b56a05adda3bcc29f07ea28f | |
| parent | f8d85c9f1867043a065398aa074a8b45203af9d3 (diff) | |
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
| -rw-r--r-- | jobs/master-builds.yml | 12 |
1 files changed, 1 insertions, 11 deletions
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] |