osmocom
/
docker-playground
mirror of https://gerrit.osmocom.org/docker-playground
10
0
Fork 0
Code Releases Activity
docker-playground/ttcn3-hlr-test/Dockerfile

25 lines
746 B
Docker
Raw Normal View History

Fix "'laforge/debian-jessie-build' not found" Instead of hardcoding laforge's username in all FROM statements in the Dockerfiles, make use of the USER variable (as passed through by the "make/Makefile" with "docker build --build-arg USER=..."). Thanks to fixeria for proposing this fix! This requires running docker-ce, old versions of docker (such as the one in the official repositories of the latest Fedora) don't support variables in the FROM line. But docker-ce can be installed after adding docker's 3rd party repositories. Closes: OS#3457 Change-Id: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f
2018-09-05 11:12:13 +00:00
ARG USER
FROM $USER/debian-stretch-titan
Add ttcn3-hlr-test container
2018-03-01 15:09:36 +00:00
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 && \
Fix git checkout for branches and commits Replace 'git checkout -f -B $BRANCH origin/$BRANCH && \' in all Dockerfiles that accept branch variables ($OSMO_TTCN3_BRANCH, $OSMO_MGW_BRANCH, ...) with the following: git checkout $BRANCH && \ (git symbolic-ref -q HEAD && git reset --hard origin/$BRANCH || exit 1); \ This allows using branch names and commit hashes in the $BRANCH variables. Using commits is needed for the bisect script added in [1]. The second line ("(git symbolic...") checks if we are in detached HEAD state after the checkout, and if we are not, pulls in all new commits from origin/$BRANCH. Note that it ends in ';' instead of '&&', because the command in the next line should be executed even if "git symbolic-ref" does not exit with 0 (detached HEAD state). Here is an example, to illustrate that the new command does the right thing. Clone a repository and be 50 commits behind origin/master: $ git clone "https://git.osmocom.org/osmo-mgw" $ cd osmo-mgw $ git reset --hard origin/master~50 With BRANCH="master": $ git checkout master && \ (git symbolic-ref -q HEAD && git reset --hard origin/master || exit 1); \ echo "done" Already on 'master' ... done $ git status Your branch is up-to-date with 'origin/master'. With BRANCH="85978d": $ git checkout 85978d && \ (git symbolic-ref -q HEAD && git reset --hard origin/85978d || exit 1); \ echo "done" Note: checking out '85978d'. ... done $ git status HEAD detached at 85978dad Related previous changes: * [2] made it work for commit hashes, but broke using branch names other than master, and pulling in new commits from master * [3] made branches other than master work again, but did not fix pulling in new commits from master * [4] reverted [3] and the git checkout related part from [2] [1] Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f [2] Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869 [3] Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3 [4] Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25 Related: OS#4015 Change-Id: I4004980baf0b7d6096702b6f3067ccbdb369a28c
2019-05-22 07:08:25 +00:00
git checkout $OSMO_TTCN3_BRANCH && \
(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \
print branch name and git commit hash during docker container build This is quite useful when looking at jenkins logs to know which exact version was built at the time. Change-Id: Id52c382b454e2beecf46820752aeff15b2c1a0ae
2019-03-29 13:12:28 +00:00
git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
Add ttcn3-hlr-test container
2018-03-01 15:09:36 +00:00
make deps-update hlr
VOLUME /data
RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \
ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /
COPY HLR_Tests.cfg /data/HLR_Tests.cfg
CMD cd /data && \
ttcn3-*: Merge logfiles no matter resolution of tests Previous to this commit, log messages were not being merged if tests were resolved as failed (test-suite.sh ending with exit code != 0), which can happen if at least one test failed. Change-Id: If293fc2d3182ef2a7b997faa8b41129a9dd89c45
2018-07-06 12:47:28 +00:00
/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/hlr/HLR_Tests; \
exit_code=$?; \
/osmo-ttcn3-hacks/log_merge.sh HLR_Tests --rm; \
exit $exit_code