osmocom
/
docker-playground
mirror of https://gerrit.osmocom.org/docker-playground
9
0
Fork 0
Code Releases Activity

ttcn3: move prepare code to shared script

Browse Source 
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
changes/19/22819/2
Oliver Smith 2 years ago
parent 73d23109b1
commit 892d910444
19 changed files with 47 additions and 102 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      debian-stretch-titan/Dockerfile
  2. 28
      debian-stretch-titan/ttcn3-docker-prepare.sh
  3. 7
      ttcn3-bsc-test/Dockerfile
  4. 7
      ttcn3-bscnat-test/Dockerfile
  5. 7
      ttcn3-bts-test/Dockerfile
  6. 7
      ttcn3-fr-test/Dockerfile
  7. 7
      ttcn3-gbproxy-test/Dockerfile
  8. 7
      ttcn3-ggsn-test/Dockerfile
  9. 7
      ttcn3-hlr-test/Dockerfile
  10. 7
      ttcn3-mgw-test/Dockerfile
  11. 7
      ttcn3-msc-test/Dockerfile
  12. 7
      ttcn3-nitb-sysinfo/Dockerfile
  13. 7
      ttcn3-pcu-test/Dockerfile
  14. 7
      ttcn3-remsim-test/Dockerfile
  15. 7
      ttcn3-sccp-test/Dockerfile
  16. 7
      ttcn3-sgsn-test/Dockerfile
  17. 7
      ttcn3-sip-test/Dockerfile
  18. 7
      ttcn3-smlc-test/Dockerfile
  19. 7
      ttcn3-stp-test/Dockerfile

2
debian-stretch-titan/Dockerfile
Unescape View File

@ -61,3 +61,5 @@ RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \
git pull && \
make deps; \
fi
ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare

28
debian-stretch-titan/ttcn3-docker-prepare.sh
Unescape View File

@ -0,0 +1,28 @@
#!/bin/sh -e
if [ $# -lt 2 ]; then
echo
echo "usage: ttcn3-docker-prepare OSMO_TTCN3_BRANCH PROJECT [PROJECT ...]"
echo "arguments:"
echo " OSMO_TTCN3_BRANCH: as passed from docker"
echo " PROJECT: make target from osmo-ttcn3-hacks.git, e.g. 'msc'"
echo
exit 1
fi
set -x
OSMO_TTCN3_BRANCH=$1
PROJECT=$2
cd /osmo-ttcn3-hacks
git fetch
git checkout "$OSMO_TTCN3_BRANCH"
if git symbolic-ref -q HEAD; then
git reset --hard origin/"$OSMO_TTCN3_BRANCH"
fi
git rev-parse --abbrev-ref HEAD
git rev-parse HEAD
make "$PROJECT"

7
ttcn3-bsc-test/Dockerfile
Unescape View File

@ -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 bsc
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc
VOLUME /data

7
ttcn3-bscnat-test/Dockerfile
Unescape View File

@ -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 bsc-nat
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc-nat
VOLUME /data

7
ttcn3-bts-test/Dockerfile
Unescape View File

@ -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 deps-update bts
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bts
VOLUME /data

7
ttcn3-fr-test/Dockerfile
Unescape View File

@ -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 fr fr-net
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" fr fr-net
VOLUME /data

7
ttcn3-gbproxy-test/Dockerfile
Unescape View File

@ -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 gbproxy
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" gbproxy
VOLUME /data

7
ttcn3-ggsn-test/Dockerfile
Unescape View File

@ -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 ggsn_tests
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" ggsn_tests
VOLUME /data

7
ttcn3-hlr-test/Dockerfile
Unescape View File

@ -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 deps-update hlr
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hlr
VOLUME /data

7
ttcn3-mgw-test/Dockerfile
Unescape View File

@ -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 mgw
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" mgw
VOLUME /data

7
ttcn3-msc-test/Dockerfile
Unescape View File

@ -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 msc
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" msc
VOLUME /data

7
ttcn3-nitb-sysinfo/Dockerfile
Unescape View File

@ -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 sysinfo
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sysinfo
VOLUME /data

7
ttcn3-pcu-test/Dockerfile
Unescape View File

@ -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 pcu
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pcu
VOLUME /data

7
ttcn3-remsim-test/Dockerfile
Unescape View File

@ -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 deps-update remsim
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" remsim
VOLUME /data

7
ttcn3-sccp-test/Dockerfile
Unescape View File

@ -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

7
ttcn3-sgsn-test/Dockerfile
Unescape View File

@ -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 sgsn
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sgsn
VOLUME /data

7
ttcn3-sip-test/Dockerfile
Unescape View File

@ -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 sip
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sip
VOLUME /data

7
ttcn3-smlc-test/Dockerfile
Unescape View File

@ -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 smlc
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" smlc
VOLUME /data

7
ttcn3-stp-test/Dockerfile
Unescape View File

@ -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 stp
RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" stp
VOLUME /data

Write Preview
Loading…
Cancel
Save