Change in docker-playground[master]: ttcn3-bts-test: move generic config files into a directory

[fixeria]

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/26681 )


Change subject: ttcn3-bts-test: move generic config files into a directory
......................................................................

ttcn3-bts-test: move generic config files into a directory

Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2
---
M ttcn3-bts-test/Makefile
R ttcn3-bts-test/generic/BTS_Tests.cfg
R ttcn3-bts-test/generic/osmo-bsc.confmerge
R ttcn3-bts-test/generic/osmo-bts.confmerge
M ttcn3-bts-test/jenkins.sh
5 files changed, 11 insertions(+), 11 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/81/26681/1

diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile
index 19154b8..2d3335f 100644
--- a/ttcn3-bts-test/Makefile
+++ b/ttcn3-bts-test/Makefile
@@ -8,8 +8,8 @@
 	osmo-bsc.src.cfg
 
 CFG_GEN_FILES = \
-	osmo-bts-generic.cfg \
-	osmo-bsc-generic.cfg \
+	generic/osmo-bts.cfg \
+	generic/osmo-bsc.cfg \
 	virtphy/osmo-bts.cfg \
 	oml/osmo-bts.cfg \
 	fh/osmo-bsc.cfg
@@ -22,20 +22,20 @@
 %src.cfg:
 	wget $(CFG_SRC_FETCH_URL)/$(@:%.src.cfg=%.cfg) -O $@
 
-osmo-bts-generic.cfg: osmo-bts.src.cfg osmo-bts.confmerge
+generic/osmo-bts.cfg: osmo-bts.src.cfg generic/osmo-bts.confmerge
 	osmo-config-merge $^ > $@
 
-osmo-bsc-generic.cfg: osmo-bsc.src.cfg osmo-bsc.confmerge
+generic/osmo-bsc.cfg: osmo-bsc.src.cfg generic/osmo-bsc.confmerge
 	osmo-config-merge $^ > $@
 
-virtphy/osmo-bts.cfg: osmo-bts-generic.cfg virtphy/osmo-bts.confmerge
+virtphy/osmo-bts.cfg: generic/osmo-bts.cfg virtphy/osmo-bts.confmerge
 	osmo-config-merge $^ > $@
 	sed -i "/osmotrx/d" $@
 
-oml/osmo-bts.cfg: osmo-bts-generic.cfg oml/osmo-bts.confmerge
+oml/osmo-bts.cfg: generic/osmo-bts.cfg oml/osmo-bts.confmerge
 	osmo-config-merge $^ > $@
 
-fh/osmo-bsc.cfg: osmo-bsc-generic.cfg fh/osmo-bsc.confmerge
+fh/osmo-bsc.cfg: generic/osmo-bsc.cfg fh/osmo-bsc.confmerge
 	osmo-config-merge $^ > $@
 
 clean:
diff --git a/ttcn3-bts-test/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg
similarity index 100%
rename from ttcn3-bts-test/BTS_Tests.cfg
rename to ttcn3-bts-test/generic/BTS_Tests.cfg
diff --git a/ttcn3-bts-test/osmo-bsc.confmerge b/ttcn3-bts-test/generic/osmo-bsc.confmerge
similarity index 100%
rename from ttcn3-bts-test/osmo-bsc.confmerge
rename to ttcn3-bts-test/generic/osmo-bsc.confmerge
diff --git a/ttcn3-bts-test/osmo-bts.confmerge b/ttcn3-bts-test/generic/osmo-bts.confmerge
similarity index 100%
rename from ttcn3-bts-test/osmo-bts.confmerge
rename to ttcn3-bts-test/generic/osmo-bts.confmerge
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 201ce46..35ce0d5 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -120,7 +120,7 @@
 network_create $SUBNET
 
 mkdir $VOL_BASE_DIR/bts-tester-generic
-cp BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/
+cp generic/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/
 write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg"
 mkdir $VOL_BASE_DIR/bts-tester-virtphy
 cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-virtphy/
@@ -136,11 +136,11 @@
    $VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc
 
 mkdir $VOL_BASE_DIR/bsc
-cp osmo-bsc-generic.cfg $VOL_BASE_DIR/bsc/
+cp generic/osmo-bsc.cfg $VOL_BASE_DIR/bsc/
 
 mkdir $VOL_BASE_DIR/bts
 mkdir $VOL_BASE_DIR/bts/unix
-cp osmo-bts-generic.cfg $VOL_BASE_DIR/bts/
+cp generic/osmo-bts.cfg $VOL_BASE_DIR/bts/
 
 mkdir $VOL_BASE_DIR/unix
 
@@ -182,7 +182,7 @@
 
 # 4) Frequency hopping tests require different configuration files
 cp fh/osmo-bsc.cfg $VOL_BASE_DIR/bsc/
-cp osmo-bts-generic.cfg $VOL_BASE_DIR/bts/
+cp generic/osmo-bts.cfg $VOL_BASE_DIR/bts/
 # restart the BSC/BTS and run the testsuite again
 docker container kill ${BUILD_TAG}-bts
 start_bsc

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26681
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2
Gerrit-Change-Number: 26681
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211224/2146b5c9/attachment.htm>