diff --git a/jenkins-common.sh b/jenkins-common.sh index 08d4e4e7..ef0a3fc6 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -270,10 +270,13 @@ network_replace_subnet_in_configs() { "$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 691c753a..7d4d3dcf 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -140,7 +140,9 @@ cp $VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg \ $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/