Commit Graph

35 Commits (8e95373986f8991b509d85515305b50dd7bd026a)

Author SHA1 Message Date
Vadim Yanitskiy 79b752fa32 */osmo-bsc.cfg: remove obsolete no-op parameters
Change-Id: Idebf9df98648b3fe8213cae550ce50e9805bac96
2021-03-09 13:50:41 +01:00
Oliver Smith 31daedcd2b osmo-*-master: move common code to *-build
Move common code from osmo-*-master to debian-stretch-build and
* add the OBS repository key (debian only)
* add the OBS repository with "nightly" feed (debian only, already done
  for centos8)
* install telnet
* invalidate the cache once the repository is updated

While at it, remove deprecated MAINTAINER lines.

This fixes the need to read both the repository index of debian-stretch
and centos8 and having to invalidate the cache if either of them changes
(instead of reading just the relevant index and invalidating the cache
only if the relevant one changes).

A similar change was done with osmo-*-latest in

Related: OS#5049
Change-Id: Id69f3eaf37f823bac0947366f27a25edd277a4cb
2021-03-04 14:45:51 +01:00
Harald Welte de52a89d0d migrate from CentOS_8_Stream to CentOS_8
Change-Id: I72c8fdae14816ec0a243f3fca4b4c2a49b562845
Related: SYS#5250
2020-12-16 10:54:37 +01:00
Pau Espin 7d7a06b749 common: Introduce OSMOCOM_REPO_MIRROR param
This allows easily changing to another osmocom repo base URL if the
default one is down.

Related: OS#4862
Change-Id: I8010b08f3dabacfb3c13a44eece6c7a490e0742e
2020-12-02 14:27:02 +01:00
Harald Welte 0cb56e4bc7 osmo-*-master: Invalidate docker cache when CentOS repo changes
We currently only invalidate the cache if the Debian repository changes,
but not if the CentOS repository changes.  This leads to strange
artefacts, such as CentOS containers for osmo-bts-master using an
old libosmocore, despite a new one being available in the repo.

As Dockerfiles don't support conditional "ADD", we need to actually
add both the CentOS and the Debian repsotiry file, so any change
in either of the two will now (unneccessarily) invalidate the cache
for both Debian and CentOS builds.

Change-Id: I7b13644afb9d3be3b94184193177e003c13718d3
2020-10-16 13:13:08 +02:00
Vadim Yanitskiy e6e2b06689 make: use $(nproc) instead of hard-coded number of cores
Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c
2020-07-13 02:52:10 +07:00
Vadim Yanitskiy c69cb106fd osmo-{bsc,msc}.cfg: eliminate 'periodic location update 30'
This parameter has been deprecated in both osmo-msc and osmo-bsc.

Change-Id: I6d33c6d9c43078ee9961d3b076386188ec45be0f
2020-06-01 01:17:35 +07:00
Oliver Smith 9913f3896b osmo-*-master: support centos8
Adjust the Dockerfiles, so 'docker_images_require osmo-mgw-master-centos8'
etc. result in a centos8 based image. centos8-build already configures the
Osmocom nightly repository, so we only need to configure it for

Related: OS#4564
Change-Id: I6579748056ce0505304378b342a698b98c77fd18
2020-05-30 09:28:34 +02:00
Vadim Yanitskiy 3bd7fc452b osmo-bsc.cfg: drop deprecated '11bit_rach_support_for_egprs'
EGPRS Packet Channel Request cannot be enabled in 'GPRS only' mode
anyway. Moreover, this command was deprecated. Let's just remove it.

Change-Id: I03733490d9c4bf78a748d22874e550e015fbab78
2020-05-29 19:23:55 +07:00
Vadim Yanitskiy 28badfaf6e osmo-bsc.cfg: drop deprecated 'ip.access rtp-base' parameter
Change-Id: Ie5494fd08fc7d2277a087ccc9502b5076fa2565b
2020-05-29 14:34:31 +07:00
Vadim Yanitskiy d210c90a68 osmo-bsc.cfg: drop non-existing 'access-list-name bsc-list'
In the recent osmo-bsc master, this configuration parameter has
been removed, so it fails to start due to "unknown parameter".

Change-Id: I8f763a4b35f80f4db637bebdd8e802a835a9fd2d
2020-05-29 14:34:31 +07:00
Vadim Yanitskiy 34152ebda6 osmo-bsc-{latest,master}/osmo-bsc.cfg: Remove 'nat' from logging
As of Change-Id Id965295dfe04f8bd5ce831db70c86f67b8dc290b the
bogus 'NAT' log category has been removed from osmo-bsc.

Change-Id: If02272c08ba2df37d1295d09c104d11f96abbe1e
2020-04-05 00:14:29 +07:00
Harald Welte 1bccbb8a66 update OBS Release.key; the old one expired today.
Change-Id: I0dd7d7f54a3eb93ca677f3bdc5e00f62694aaa9e
2020-03-30 18:06:58 +02:00
Pau Espin a9877bf487 Update osmo-*/Dockerfile to log stdout+stderr of process to log file
This way we get VTY parsing failures as well as backtraces upon process

Related: OS#4212
Change-Id: I9493ff73ef27c7c6d32b00cf827704b3f9cbf86a
2019-11-19 18:29:00 +00:00
Pau Espin 6a994afdf9 Fix trailing whitespace
Change-Id: Ib51a84560bad521d0adf4bb883c10418c51468a2
2019-10-23 17:58:05 +02:00
Daniel Willmann b39b785fdf Have only one bts/bsc configured in osmo-bsc and bscnat
The way our counter reporting works is that each counter group is
reported even if the same one exists multiple times. To avoid that
change the default config (used by to only configure one
bts / bsc.

Change-Id: I57468d983580b5ed4f15961ac1eac9bed9096556
Related: OS#1700
2019-06-24 14:12:01 +00:00
Daniel Willmann 3b96cf3bb4 Add script to regenerate VTY and counter documentation
This script needs access to the VTY interface, so I changed some
remaining config files to bind the VTY interface to

There are a couple of services that do that already.

Related: OS#1700
Change-Id: Ic5cf7f59de0c18d4c5568b89433c2b11db2a72a5
2019-06-18 18:18:08 +00:00
Oliver Smith 61f2be7bd4 Fix git checkout for branches and commits
Replace 'git checkout -f -B $BRANCH origin/$BRANCH && \' in all
Dockerfiles that accept branch variables ($OSMO_TTCN3_BRANCH,
$OSMO_MGW_BRANCH, ...) with the following:
	git checkout $BRANCH && \
	(git symbolic-ref -q HEAD && git reset --hard origin/$BRANCH || exit 1); \

This allows using branch names and commit hashes in the $BRANCH
variables. Using commits is needed for the bisect script added in [1].

The second line ("(git symbolic...") checks if we are in detached HEAD
state after the checkout, and if we are not, pulls in all new commits
from origin/$BRANCH. Note that it ends in ';' instead of '&&', because
the command in the next line should be executed even if
"git symbolic-ref" does not exit with 0 (detached HEAD state).

Here is an example, to illustrate that the new command does the right
thing. Clone a repository and be 50 commits behind origin/master:
$ git clone ""
$ cd osmo-mgw
$ git reset --hard origin/master~50

With BRANCH="master":
$ git checkout master && \
  (git symbolic-ref -q HEAD && git reset --hard origin/master || exit 1); \
  echo "done"
Already on 'master'
$ git status
Your branch is up-to-date with 'origin/master'.

With BRANCH="85978d":
$ git checkout 85978d && \
  (git symbolic-ref -q HEAD && git reset --hard origin/85978d || exit 1); \
  echo "done"
Note: checking out '85978d'.
$ git status
HEAD detached at 85978dad

Related previous changes:
* [2] made it work for commit hashes, but broke using branch names other
      than master, and pulling in new commits from master
* [3] made branches other than master work again, but did not fix
      pulling in new commits from master
* [4] reverted [3] and the git checkout related part from [2]

[1] Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f
[2] Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869
[3] Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3
[4] Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25

Related: OS#4015
Change-Id: I4004980baf0b7d6096702b6f3067ccbdb369a28c
2019-05-22 11:18:56 +02:00
Harald Welte 06ac6e455e Revert "Simplify git checkout, allow branches and commits"
Unfortuately this commit will check out *local* master (i.e. the
previous checkout) rather than the origin/master as it's supposed to
be. This means that ever since merging this patch, our ttcn3 tests
were running some "undefined" stale versions and not current master.

This reverts commit 26565bb729.

Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25
2019-05-21 17:53:11 +02:00
Oliver Smith 26565bb729 Simplify git checkout, allow branches and commits
Replace the following statements:

a) "git checkout -f -B $BRANCH origin/$BRANCH"
b) "git checkout -f -B $BRANCH $BRANCH"


c) "git checkout -f $BRANCH"

Regarding a), we don't need to specify 'origin/' for each branch, since
we are cloning the repositories in the same Dockerfile, and therefore we
know for sure that there is only one remote and branch names won't be
ambiguous. Removing the 'origin/' allows to put commit hashes into the
branch variables (like done in the new bisect script [1]).

Version b) does not work with branch names:
$ git checkout -f -B osmith/check-imei-before-lu osmith/check-imei-before-lu
fatal: Cannot update paths and switch to branch 'osmith/check-imei-before-lu' at the same time.
Did you intend to checkout 'osmith/check-imei-before-lu' which can not be resolved as commit?

New version c) works with both commits and branches, and it is shorter.

[1] Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f

Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3
2019-05-07 10:24:52 +02:00
Daniel Willmann b59a9ed8d4 Add OSMO_*_BRANCH environment variables for build args
Previously we could only set OSMO_TTCN3_BRANCH as environment variable
to build a test other than master.

This patch adds environment variables for all osmo-*-master images which
allow docker tests to be executed for an arbitrary commit.

The origin/ prefix from the git checkout command is removed so the
*_BRANCH variable doesn't have to contain branch names, but van also
contain arbitrary commits. This shouldn't have any adverse effect as we
only have one remote in the checkout.

Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869
2019-04-25 13:56:14 +02:00
Harald Welte 7c53c9e60d Switch all osmo-*-master and ttcn3-*-test from jessie to stretch
Jessie will be EOL in June 2019, let's make the switch to stretch
before that.

Change-Id: I37a534d07081f3d321869c86d49d03171c8da0c6
2019-03-30 09:56:36 +00:00
Harald Welte cffe1022b5 print branch name and git commit hash during docker container build
This is quite useful when looking at jenkins logs to know which exact
version was built at the time.

Change-Id: Id52c382b454e2beecf46820752aeff15b2c1a0ae
2019-03-29 16:40:40 +00:00
Vadim Yanitskiy b6c3dd787a .../osmo-bsc.cfg: drop deprecated dyn_ts_allow_tch_f
Since Ib2335d02ea545aff837aadd49f15b2fdb418c46e, this VTY option
is deprecated in osmo-bsc, so let's actualize the config files.

Change-Id: I709e1afd2a9cccdc92eec312dff607947a10c299
2019-01-14 21:07:36 +00:00
Harald Welte ff3dc6e45f ensure well-formed config files
Change-Id: Id687e63c418e2e955ccbb92f2420a80fc0704ea4
2018-09-26 09:27:38 +00:00
Oliver Smith 7ed7a2bdd2 Fix "'laforge/debian-jessie-build' not found"
Instead of hardcoding laforge's username in all FROM statements in the
Dockerfiles, make use of the USER variable (as passed through by the
"make/Makefile" with "docker build --build-arg USER=..."). Thanks to
fixeria for proposing this fix!

This requires running docker-ce, old versions of docker (such as the
one in the official repositories of the latest Fedora) don't support
variables in the FROM line. But docker-ce can be installed after
adding docker's 3rd party repositories.

Closes: OS#3457

Change-Id: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f
2018-09-06 15:17:06 +02:00
Pau Espin 113d916dc9 Remove libosmo-legacy-mgcp-dev from all Dockerfile
Only openbsc.git related programs require it.

Change-Id: Ic641e71e45c5fbd174505116fa45a74e27dad81a
2018-08-17 18:01:57 +02:00
Vadim Yanitskiy 3e1bd78423 osmo-bsc-master/Dockerfile: drop wrong configure option
Change-Id: I3fecd622df136a18a32a9095ede3e2629e2f7b4e
2018-06-25 14:43:51 +07:00
Harald Welte cf81610bd4 remove deprecated "dest" config option from config files
Change-Id: I1073846c04a8466f2ccf501e27cf152df09042c5
2018-06-03 17:11:22 +00:00
Harald Welte 61145cf086 bsc: Enable LCLS tests from BSC_Tests_LCLS TTCN-3 module
Change-Id: I0439c61cc49e088efef3b91c1dbf293ee9a44939
2018-06-03 15:16:41 +00:00
Harald Welte 0434f34c36 osmo-*-master: add Dockerfile ARG for git repo branch to be built
This allows the user to build any non-master branches of the related
repositories, which is helpful for local testing before pushing changes
to git.

Change-Id: I0c3349e9a60015472c96bd24fbf29aad57501a00
2018-05-23 20:00:24 +02:00
Neels Hofmeyr 1b51ff89c5 osmo-bsc.cfg: drop legacy config: timeout-ping, timeout-pong
Change-Id: I70bffa7ed96da099993ba0cedc50178ca9e00db4
2018-04-05 00:54:18 +02:00
Neels Hofmeyr e707891fa8 fix osmo-bsc.cfg: drop no longer supported options 2018-02-23 15:09:29 +01:00
Harald Welte afe1ec8dc1 Release.key of osmocom-nightly has expired; update it in all Dockerfiles 2018-02-04 17:20:04 +01:00
Harald Welte 18569e9d2c add osmo-bsc-master container 2017-12-17 11:02:57 +00:00