osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36391?usp=email ) Change subject: ttcn3-ggsn-test: move confgs to subdirs ...................................................................... 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 --- M ttcn3-ggsn-test/Dockerfile M ttcn3-ggsn-test/jenkins.sh R ttcn3-ggsn-test/osmo-ggsn-kernel/fragment.config R ttcn3-ggsn-test/osmo-ggsn-kernel/initrd-ggsn.sh R ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg R ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn.cfg R ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg 7 files changed, 27 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified 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 @@ 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 @@ 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 @@ " 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 @@ } 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 similarity index 100% rename from ttcn3-ggsn-test/fragment.config rename to 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 similarity index 100% rename from ttcn3-ggsn-test/initrd-ggsn.sh rename to 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 similarity index 100% rename from ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg rename to 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 similarity index 100% rename from ttcn3-ggsn-test/osmo-ggsn.cfg rename to 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 similarity index 100% rename from ttcn3-ggsn-test/GGSN_Tests.cfg rename to ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36391?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I03a06f9f516922c47e3092ff7d7c2c68b0852c1b Gerrit-Change-Number: 36391 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged