Started by an SCM change3097ac0902cd740139b0d1cfdbd90179de7379d28837ac0902cd740139b0d1cfdbd90179de7379d2883refs/remotes/origin/osmith/wip-dahdi7ac0902cd740139b0d1cfdbd90179de7379d28837ac0902cd740139b0d1cfdbd90179de7379d2883refs/remotes/origin/osmith/wip-dahdi3188e3b3ff43c721326451e357cc4fbb685138df79f8e3b3ff43c721326451e357cc4fbb685138df79frefs/remotes/origin/master8e3b3ff43c721326451e357cc4fbb685138df79f8e3b3ff43c721326451e357cc4fbb685138df79frefs/remotes/origin/master8e3b3ff43c721326451e357cc4fbb685138df79f8e3b3ff43c721326451e357cc4fbb685138df79frefs/remotes/origin/mastergit://git.osmocom.org/docker-playgroundhttps://jenkins.osmocom.org/jenkins/view/all/job/update-osmo-ci-on-slaves-dp/318/artifacthttps://jenkins.osmocom.org/jenkins/view/all/job/update-osmo-ci-on-slaves-dp/changeshttps://jenkins.osmocom.org/jenkins/view/all/job/update-osmo-ci-on-slaves-dp/318/https://jenkins.osmocom.org/jenkins/view/all/job/update-osmo-ci-on-slaves-dp/318/testReportfalse#3181489255update-osmo-ci-on-slaves-dp #318318falsefalse318674302SUCCESS1644512169594https://jenkins.osmocom.org/jenkins/view/all/job/update-osmo-ci-on-slaves-dp/318/gtp0-deb9build- .gitignorettcn3-bts-test/generic/osmo-bsc.confmergettcn3-bts-test/oml/osmo-bts.confmergettcn3-bts-test/fh/osmo-bsc.confmergettcn3-bts-test/generic/osmo-bsc.cfgttcn3-bts-test/oml/osmo-bts.cfgttcn3-bts-test/fh/osmo-bsc.cfgttcn3-bts-test/generic/osmo-bts.cfgttcn3-bts-test/Makefilettcn3-bts-test/virtphy/osmo-bts.confmergettcn3-bts-test/virtphy/osmo-bts.cfgttcn3-bts-test/generic/osmo-bts.confmergettcn3-bts-test/jenkins.sh8e3b3ff43c721326451e357cc4fbb685138df79f1644511764000https://jenkins.osmocom.org/jenkins/user/fixeriaVadim Yanitskiyvyanitskiy@sysmocom.dettcn3-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
2022-02-10 22:49:24 +06008e3b3ff43c721326451e357cc4fbb685138df79fttcn3-bts-test: use osmo-config-merge to generate config filesdeletettcn3-bts-test/virtphy/osmo-bts.cfgeditttcn3-bts-test/Makefileeditttcn3-bts-test/jenkins.shaddttcn3-bts-test/virtphy/osmo-bts.confmergedeletettcn3-bts-test/generic/osmo-bsc.cfgdeletettcn3-bts-test/fh/osmo-bsc.cfgaddttcn3-bts-test/generic/osmo-bts.confmergedeletettcn3-bts-test/oml/osmo-bts.cfgaddttcn3-bts-test/oml/osmo-bts.confmergeedit.gitignoredeletettcn3-bts-test/generic/osmo-bts.cfgaddttcn3-bts-test/generic/osmo-bsc.confmergeaddttcn3-bts-test/fh/osmo-bsc.confmerge
githttps://jenkins.osmocom.org/jenkins/user/fixeriaVadim Yanitskiyfixeria