diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2024-03-20 14:53:59 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2024-03-25 12:21:12 +0100 |
| commit | 59dcbf762cb459228adeedd3d70f2fe5371bd5b9 (patch) | |
| tree | 9fe04fffba4677cf2f2a5e682cdbd8ca06f2306d | |
| parent | 5946a075faf6ac3095bdd20311db61db297b88d5 (diff) | |
ttcn3-ggsn-test: move confgs to subdirs
Prepare to add variations of the configs: move them to subdirs, so we
don't cullter the main directory.
Related: OS#6096
Change-Id: I03a06f9f516922c47e3092ff7d7c2c68b0852c1b
| -rw-r--r-- | ttcn3-ggsn-test/Dockerfile | 2 | ||||
| -rwxr-xr-x | ttcn3-ggsn-test/jenkins.sh | 19 | ||||
| -rw-r--r-- | ttcn3-ggsn-test/osmo-ggsn-kernel/fragment.config (renamed from ttcn3-ggsn-test/fragment.config) | 0 | ||||
| -rw-r--r-- | ttcn3-ggsn-test/osmo-ggsn-kernel/initrd-ggsn.sh (renamed from ttcn3-ggsn-test/initrd-ggsn.sh) | 0 | ||||
| -rw-r--r-- | ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg (renamed from ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg) | 0 | ||||
| -rw-r--r-- | ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn.cfg (renamed from ttcn3-ggsn-test/osmo-ggsn.cfg) | 0 | ||||
| -rw-r--r-- | ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg (renamed from ttcn3-ggsn-test/GGSN_Tests.cfg) | 0 |
7 files changed, 14 insertions, 7 deletions
diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 447ddeb..137a4cd 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -8,6 +8,6 @@ RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" ggsn_tests VOLUME /data -COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg +COPY ttcn3/GGSN_Tests.cfg /data/GGSN_Tests.cfg CMD ttcn3-docker-run ggsn_tests GGSN_Tests diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 1ea9d91..3f1eaf3 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -16,13 +16,12 @@ start_ggsn() { GGSN_CMD="osmo-ggsn -c /data/osmo-ggsn.cfg" GGSN_DOCKER_ARGS="" if [ "$KERNEL_TEST" = "1" ]; then - cp osmo-ggsn-kernel-gtp.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg - cp initrd-ggsn.sh $VOL_BASE_DIR/ggsn/ + cp osmo-ggsn-kernel/initrd-ggsn.sh $VOL_BASE_DIR/ggsn/ network_replace_subnet_in_configs kernel_test_prepare \ "defconfig" \ - "fragment.config" \ + "osmo-ggsn-kernel/fragment.config" \ "$VOL_BASE_DIR/ggsn/initrd-ggsn.sh" \ "$REPO_USER/osmo-ggsn-$IMAGE_SUFFIX" \ -v $VOL_BASE_DIR/ggsn:/data @@ -36,8 +35,6 @@ start_ggsn() { " OSMO_SUT_HOST="172.18.$SUBNET.200" else - cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ - network_replace_subnet_in_configs GGSN_DOCKER_ARGS=" $(docker_network_params $SUBNET 201) @@ -75,11 +72,21 @@ start_testsuite() { } mkdir $VOL_BASE_DIR/ggsn-tester -cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ +cp ttcn3/GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg" mkdir $VOL_BASE_DIR/ggsn network_create + +if [ "$KERNEL_TEST" = 1 ]; then + CONFIGS_DIR="osmo-ggsn-kernel" +else + CONFIGS_DIR="osmo-ggsn" +fi + +cp "$CONFIGS_DIR"/osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg +network_replace_subnet_in_configs + start_ggsn start_testsuite diff --git a/ttcn3-ggsn-test/fragment.config b/ttcn3-ggsn-test/osmo-ggsn-kernel/fragment.config index b6e2071..b6e2071 100644 --- a/ttcn3-ggsn-test/fragment.config +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel/fragment.config diff --git a/ttcn3-ggsn-test/initrd-ggsn.sh b/ttcn3-ggsn-test/osmo-ggsn-kernel/initrd-ggsn.sh index c554f8a..c554f8a 100644 --- a/ttcn3-ggsn-test/initrd-ggsn.sh +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel/initrd-ggsn.sh diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg index afa36d6..afa36d6 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn.cfg index eb1558e..eb1558e 100644 --- a/ttcn3-ggsn-test/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn.cfg diff --git a/ttcn3-ggsn-test/GGSN_Tests.cfg b/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg index cb548b3..cb548b3 100644 --- a/ttcn3-ggsn-test/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg |