pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/27686 )
Change subject: ttcn3-ggsn-ogs: Rename config files
......................................................................
ttcn3-ggsn-ogs: Rename config files
Let's make names similar to what's used in PGW_Tests. Also, in
open5gs.git, config files don't contain the "d" at the end.
Change-Id: If56d1a890a4f1b80b4f04ae22644f9cb9cdd35f4
---
M ttcn3-ggsn-test/jenkins-ogs.sh
R ttcn3-ggsn-test/ogs/open5gs-smf.yaml
R ttcn3-ggsn-test/ogs/open5gs-upf.yaml
3 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/86/27686/1
diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh
index 172821f..205abbc 100755
--- a/ttcn3-ggsn-test/jenkins-ogs.sh
+++ b/ttcn3-ggsn-test/jenkins-ogs.sh
@@ -19,8 +19,7 @@
write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg"
mkdir $VOL_BASE_DIR/ggsn
-cp ogs/smfd.yaml $VOL_BASE_DIR/ggsn/
-cp ogs/upfd.yaml $VOL_BASE_DIR/ggsn/
+cp ogs/open5gs-*.yaml $VOL_BASE_DIR/ggsn/
cp ogs/freediameter.conf $VOL_BASE_DIR/ggsn/
cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/
cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/
@@ -39,7 +38,7 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 201) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "open5gs-smfd -c /data/smfd.yaml
>/data/open5gs-smfd.out 2>&1"
+ /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
docker run --cap-add=NET_ADMIN \
--device /dev/net/tun:/dev/net/tun \
@@ -51,7 +50,7 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 222) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "/data/upfd.sh -c /data/upfd.yaml
>/data/open5gs-upfd.out 2>&1"
+ /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml
>/data/open5gs-upfd.out 2>&1"
# start docker container with testsuite in foreground
docker run --rm \
@@ -63,4 +62,3 @@
--name ${BUILD_TAG}-ggsn-test \
$DOCKER_ARGS \
$REPO_USER/ttcn3-ggsn-test
-
diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml
b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
similarity index 100%
rename from ttcn3-ggsn-test/ogs/smfd.yaml
rename to ttcn3-ggsn-test/ogs/open5gs-smf.yaml
diff --git a/ttcn3-ggsn-test/ogs/upfd.yaml
b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml
similarity index 100%
rename from ttcn3-ggsn-test/ogs/upfd.yaml
rename to ttcn3-ggsn-test/ogs/open5gs-upf.yaml
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27686
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If56d1a890a4f1b80b4f04ae22644f9cb9cdd35f4
Gerrit-Change-Number: 27686
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-MessageType: newchange
