From 892d910444f7572da9591305dce0e630aeec3104 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 10 Feb 2021 15:22:21 +0100 Subject: ttcn3: move prepare code to shared script Move the git fetch/checkout code and make call to build the testsuite, to debian-stretch-titan/ttcn3-docker-prepare.sh. In the next patch, I will extend the script to update deps right before building too (e.g. because OSMO_TTCN3_BRANCH changed). Related: OS#5017 Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 --- ttcn3-sccp-test/Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'ttcn3-sccp-test') diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index d906106..b047ba7 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -3,12 +3,7 @@ FROM $USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make sccp +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sccp VOLUME /data -- cgit v1.2.3