Skip to content

Changes

Summary

  1. ttcn3-bts-test: move generic config files into a directory (details)
  2. ttcn3-bts-test: use osmo-config-merge to generate config files (details)
Commit edaa9d3033aaeab69014b0b355cfd7511341c9b2 by Vadim Yanitskiy
ttcn3-bts-test: move generic config files into a directory

Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2
The file was addedttcn3-bts-test/generic/BTS_Tests.cfg
The file was modified ttcn3-bts-test/Dockerfile
The file was addedttcn3-bts-test/generic/osmo-bts.cfg
The file was modified ttcn3-bts-test/jenkins.sh
The file was removedttcn3-bts-test/osmo-bsc.cfg
The file was removedttcn3-bts-test/BTS_Tests.cfg
The file was addedttcn3-bts-test/generic/osmo-bsc.cfg
The file was removedttcn3-bts-test/osmo-bts.cfg
Commit 8e3b3ff43c721326451e357cc4fbb685138df79f by Vadim Yanitskiy
ttcn3-bts-test: use osmo-config-merge to generate config files

This uses the config files from osmo-ttcn3-hacks.git instead of keeping
local copies around here, which has shown many times will get out of
sync.  Extract the original files (*.src.cfg) from the testsuite image
(ttcn3-bts-test) and merge them with the local *.confmerge files using
osmo-config-merge.  Use the resulting files (*.gen.cfg).

Unfortunately, osmo-config-merge is not capable of removing text blocks
or substituting specific parts, so we fall-back to using sed where it's
needed.  A good example is 'log gsmtap 127.0.0.1', as there is no
command for removing a logging target of such type.

Co-Authored-By: Vadim Yanitskiy <vyanitskiy@sysmocom.de>
Co-Authored-By: Oliver Smith <osmith@sysmocom.de>
Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8
The file was removedttcn3-bts-test/fh/osmo-bsc.cfg
The file was addedttcn3-bts-test/fh/osmo-bsc.confmerge
The file was removedttcn3-bts-test/virtphy/osmo-bts.cfg
The file was modified ttcn3-bts-test/jenkins.sh
The file was removedttcn3-bts-test/generic/osmo-bts.cfg
The file was addedttcn3-bts-test/virtphy/osmo-bts.confmerge
The file was modified .gitignore
The file was removedttcn3-bts-test/generic/osmo-bsc.cfg
The file was addedttcn3-bts-test/generic/osmo-bsc.confmerge
The file was addedttcn3-bts-test/oml/osmo-bts.confmerge
The file was removedttcn3-bts-test/oml/osmo-bts.cfg
The file was modified ttcn3-bts-test/Makefile
The file was addedttcn3-bts-test/generic/osmo-bts.confmerge