Attention is currently required from: fixeria. Hello fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/27103 to look at the new patch set (#2). Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... 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. Copy the files from the git repository checked out in the ttcn3-bts-test docker image, so we don't need to take care of cloning the repository again and checking out the same commit as used inside that image. Original files are copied to *.src.cfg, and then merged with the local *.confmerge files using osmo-conf-merge (*.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: If2d1ba8a775dc6c396f50f9853e633df110329a9 --- M .gitignore M jenkins-common.sh D ttcn3-bts-test/fh/osmo-bsc.cfg A ttcn3-bts-test/fh/osmo-bsc.confmerge M ttcn3-bts-test/jenkins.sh D ttcn3-bts-test/oml/osmo-bts.cfg A ttcn3-bts-test/oml/osmo-bts.confmerge D ttcn3-bts-test/osmo-bsc.cfg A ttcn3-bts-test/osmo-bsc.confmerge D ttcn3-bts-test/osmo-bts.cfg A ttcn3-bts-test/osmo-bts.confmerge D ttcn3-bts-test/virtphy/osmo-bts.cfg A ttcn3-bts-test/virtphy/osmo-bts.confmerge 13 files changed, 336 insertions(+), 851 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/03/27103/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If2d1ba8a775dc6c396f50f9853e633df110329a9 Gerrit-Change-Number: 27103 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith@sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-CC: laforge <laforge@osmocom.org> Gerrit-Attention: fixeria <vyanitskiy@sysmocom.de> Gerrit-MessageType: newpatchset