This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.orgReview at https://gerrit.osmocom.org/7387 ttcn3-bsc-test: move Dockerfile RUN commands to Makefile within docker img Add a Makefile to the image's root, move the RUN command there and call that 'make' from the Dockerfile RUN command. This helps manual hacking: just run 'make' in the container's root dir to run the BSC tests. >From the new Makefile, also make sure that the osmo-ttcn3-hacks is compiled. Hence a container can be run with 'jenkins.sh -h ~/src/osmo-ttcn3-hacks', so that the sources are editable outside the container, and a simple 'make' in the container root rebuilds and runs in all the right places. Change-Id: Ic7c33fa7325a0c66327dd4145caadfbed9470de7 --- M ttcn3-bsc-test/Dockerfile A ttcn3-bsc-test/Makefile.within-docker-img 2 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/87/7387/1 diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 0a4b4e6..a9cf3d6 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -25,7 +25,6 @@ ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / COPY BSC_Tests.cfg /data/BSC_Tests.cfg +COPY Makefile.within-docker-img /Makefile -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc/BSC_Tests && \ - /osmo-ttcn3-hacks/log_merge.sh BSC_Tests --rm +CMD cd / && make test log diff --git a/ttcn3-bsc-test/Makefile.within-docker-img b/ttcn3-bsc-test/Makefile.within-docker-img new file mode 100644 index 0000000..63f0ab9 --- /dev/null +++ b/ttcn3-bsc-test/Makefile.within-docker-img @@ -0,0 +1,13 @@ +.PHONY: compile test log + +all: compile test + +compile: + $(MAKE) -C /osmo-ttcn3-hacks/bsc compile + $(MAKE) -C /osmo-ttcn3-hacks/bsc -j + +test: + cd /data; /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc/BSC_Tests + +log: + cd /data; /osmo-ttcn3-hacks/log_merge.sh BSC_Tests --rm -- To view, visit https://gerrit.osmocom.org/7387 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7c33fa7325a0c66327dd4145caadfbed9470de7 Gerrit-PatchSet: 1 Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>