osmith submitted this change.
ttcn3-bts-test: replace subnets during 'make cfg'
Make ttcn3-bts-test work as expected again by replacing the subnets
hardcoded in the confmerge files and Makefile.
Related: OS#5802
Change-Id: I733619f80b4e2456da070649634d3c942bb6d95f
---
M jenkins-common.sh
M ttcn3-bts-test/jenkins.sh
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/jenkins-common.sh b/jenkins-common.sh
index 08d4e4e..ef0a3fc 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -270,10 +270,13 @@
"$VOL_BASE_DIR" \
-name '*.cfg' -o \
-name '*.conf' -o \
+ -name '*.confmerge' -o \
+ -name '*.inc' -o \
-name '*.scm' -o \
-name '*.sh' -o \
-name '*.txt' -o \
- -name '*.yaml' \
+ -name '*.yaml' -o \
+ -name 'Makefile' \
)"
if [ -z "$files" ]; then
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 691c753..7d4d3dc 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -140,7 +140,9 @@
$VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc
# (re)generate the configuration files
-make cfg
+cp Makefile $VOL_BASE_DIR/Makefile
+network_replace_subnet_in_configs
+make -f $VOL_BASE_DIR/Makefile cfg
mkdir $VOL_BASE_DIR/bsc
cp generic/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/
To view, visit change 31011. To unsubscribe, or for help writing mail filters, visit settings.