Skip to content
Success

Changes

Summary

  1. ttcn3: remove /root/projects/git symlink (details)
  2. ttcn3: move initial clone to debian-stretch-titan (details)
  3. debian-stretch-titan: update deps on change (details)
  4. ttcn3: move prepare code to shared script (details)
  5. debian-stretch-titan: prepare: run 'make deps' (details)
  6. debian-stretch-titan: prepare: start/stop links (details)
  7. ttcn3: move shared run code to script (details)
  8. ttcn3-{fr,gbproxy}-test: use ttcn3-docker-run too (details)
Commit db3f98113cbdeb0110ca0b9ba01cd12d66d97e34 by Oliver Smith
ttcn3: remove /root/projects/git symlink

Remove leftover from old TTCN-3 build scripts, before refactoring ttcn3
Dockerfiles. This line has already been removed in 357ec806 from 2017 for
ggsn-test.

In osmo-ttcn3-hacks.git, this is only referenced in the obsolete
bin/install.script (looks like we could remove that, together with the
rest of the bin dir?).

Related: OS#5017
Change-Id: Id23e7fae58ba246916a38aa0a10035d4f67f7588
The file was modifiedttcn3-fr-test/Dockerfile
The file was modifiedttcn3-nitb-sysinfo/Dockerfile
The file was modifiedttcn3-bts-test/Dockerfile
The file was modifiedttcn3-pcu-test/Dockerfile
The file was modifiedttcn3-smlc-test/Dockerfile
The file was modifiedttcn3-bscnat-test/Dockerfile
The file was modifiedttcn3-sgsn-test/Dockerfile
The file was modifiedttcn3-bsc-test/Dockerfile
The file was modifiedttcn3-gbproxy-test/Dockerfile
The file was modifiedttcn3-sccp-test/Dockerfile
The file was modifiedttcn3-sip-test/Dockerfile
The file was modifiedttcn3-stp-test/Dockerfile
The file was modifiedttcn3-msc-test/Dockerfile
The file was modifiedttcn3-hlr-test/Dockerfile
The file was modifiedttcn3-mgw-test/Dockerfile
The file was modifiedttcn3-remsim-test/Dockerfile
Commit 61fed0ad3959b0b5d841bad9d99217a20cb9ffaa by Oliver Smith
ttcn3: move initial clone to debian-stretch-titan

Clone the osmo-ttcn3-hacks and all dependency repositories less often by
moving related commands to the shared debian-stretch-titan image.

Remove the 'git checkout -f -B master origin/master' line, because the
master branch is checked out by default.

While at it, move the shared "git config" commands too, and move them
before cloning the repositories, so they don't run again whenever the
deps change (logic to invalidate the cache if deps change will be added
in the next patch).

Related: OS#5017
Change-Id: I2bb142dce061eba4b6a828c4e435510e309989fd
The file was modifiedttcn3-msc-test/Dockerfile
The file was modifiedttcn3-bts-test/Dockerfile
The file was modifiedttcn3-nitb-sysinfo/Dockerfile
The file was modifiedttcn3-smlc-test/Dockerfile
The file was modifiedttcn3-remsim-test/Dockerfile
The file was modifiedttcn3-pcu-test/Dockerfile
The file was modifieddebian-stretch-titan/Dockerfile
The file was modifiedttcn3-stp-test/Dockerfile
The file was modifiedttcn3-bscnat-test/Dockerfile
The file was modifiedttcn3-fr-test/Dockerfile
The file was modifiedttcn3-mgw-test/Dockerfile
The file was modifiedttcn3-hlr-test/Dockerfile
The file was modifiedttcn3-sgsn-test/Dockerfile
The file was modifiedttcn3-gbproxy-test/Dockerfile
The file was modifiedttcn3-sccp-test/Dockerfile
The file was modifiedttcn3-sip-test/Dockerfile
The file was modifiedttcn3-bsc-test/Dockerfile
The file was modifiedttcn3-ggsn-test/Dockerfile
Commit 73d23109b14aaf2031b60cc06eec3573ae4920bc by Oliver Smith
debian-stretch-titan: update deps on change

After the initial clone of osmo-ttcn3-hacks and deps, let docker
download deps/Makefile to invalidate the cache if the file changed.

Run "git pull" and "make deps" afterwards, but only if the Makefile is
different. The "if" saves time in the initial build of the image, it
avoids the "git fetch" on every dependency repository during "make deps".

Related: OS#5017
Change-Id: I56673312cfb23375d67900016aaac1931f677275
The file was modifieddebian-stretch-titan/Dockerfile
Commit 892d910444f7572da9591305dce0e630aeec3104 by Oliver Smith
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
The file was modifiedttcn3-sgsn-test/Dockerfile
The file was modifiedttcn3-nitb-sysinfo/Dockerfile
The file was modifiedttcn3-stp-test/Dockerfile
The file was addeddebian-stretch-titan/ttcn3-docker-prepare.sh
The file was modifiedttcn3-ggsn-test/Dockerfile
The file was modifiedttcn3-smlc-test/Dockerfile
The file was modifiedttcn3-sccp-test/Dockerfile
The file was modifiedttcn3-sip-test/Dockerfile
The file was modifiedttcn3-gbproxy-test/Dockerfile
The file was modifieddebian-stretch-titan/Dockerfile
The file was modifiedttcn3-msc-test/Dockerfile
The file was modifiedttcn3-mgw-test/Dockerfile
The file was modifiedttcn3-hlr-test/Dockerfile
The file was modifiedttcn3-remsim-test/Dockerfile
The file was modifiedttcn3-pcu-test/Dockerfile
The file was modifiedttcn3-bsc-test/Dockerfile
The file was modifiedttcn3-bscnat-test/Dockerfile
The file was modifiedttcn3-bts-test/Dockerfile
The file was modifiedttcn3-fr-test/Dockerfile
Commit 9206cf6b280af554ffabba2244fb733c44a0a874 by Oliver Smith
debian-stretch-titan: prepare: run 'make deps'

Run 'make deps' in ttcn3-docker-prepare.sh, if needed.

Related: OS#5017
Change-Id: I9085203b27d310b63a035fd71f7c2a78d02710d4
The file was modifieddebian-stretch-titan/ttcn3-docker-prepare.sh
Commit 914a486ef1c5a5b16f6f0f3bce2c327ea54fcac2 by Oliver Smith
debian-stretch-titan: prepare: start/stop links

Create symlinks to ttcn3-*-start.sh and ttcn3-*-stop.sh in the
prepare.sh script instead of in each of the ttcn3 Dockerfiles.

Related: OS#5017
Change-Id: I634cf71cff7936efe6e0461d21dc1119de922ada
The file was modifiedttcn3-ggsn-test/Dockerfile
The file was modifiedttcn3-fr-test/Dockerfile
The file was modifiedttcn3-sgsn-test/Dockerfile
The file was modifiedttcn3-gbproxy-test/Dockerfile
The file was modifiedttcn3-stp-test/Dockerfile
The file was modifiedttcn3-pcu-test/Dockerfile
The file was modifiedttcn3-mgw-test/Dockerfile
The file was modifiedttcn3-sip-test/Dockerfile
The file was modifiedttcn3-bsc-test/Dockerfile
The file was modifiedttcn3-sccp-test/Dockerfile
The file was modifiedttcn3-hlr-test/Dockerfile
The file was modifieddebian-stretch-titan/ttcn3-docker-prepare.sh
The file was modifiedttcn3-msc-test/Dockerfile
The file was modifiedttcn3-remsim-test/Dockerfile
The file was modifiedttcn3-smlc-test/Dockerfile
The file was modifiedttcn3-bscnat-test/Dockerfile
The file was modifiedttcn3-bts-test/Dockerfile
Commit 2b38b8e7791706216c489d63b6190cbeef027138 by Oliver Smith
ttcn3: move shared run code to script

While I'm at it with tidying up the Dockerfiles, create a
ttcn3-docker-run.sh with shared run code.

Related: OS#5017
Change-Id: Id90769707158f0488eca2313c57b99ea7a4a27c8
The file was modifiedttcn3-msc-test/Dockerfile
The file was modifiedttcn3-hlr-test/Dockerfile
The file was modifiedttcn3-mgw-test/Dockerfile
The file was modifiedttcn3-smlc-test/Dockerfile
The file was modifiedttcn3-ggsn-test/Dockerfile
The file was modifiedttcn3-sccp-test/Dockerfile
The file was addeddebian-stretch-titan/ttcn3-docker-run.sh
The file was modifiedttcn3-pcu-test/Dockerfile
The file was modifiedttcn3-remsim-test/Dockerfile
The file was modifiedttcn3-nitb-sysinfo/Dockerfile
The file was modifiedttcn3-sgsn-test/Dockerfile
The file was modifiedttcn3-sip-test/Dockerfile
The file was modifiedttcn3-bts-test/Dockerfile
The file was modifiedttcn3-bscnat-test/Dockerfile
The file was modifiedttcn3-stp-test/Dockerfile
The file was modifieddebian-stretch-titan/Dockerfile
The file was modifiedttcn3-bsc-test/Dockerfile
Commit ce824cc3e17552cc963439f2a25ede39e0c62cda by Oliver Smith
ttcn3-{fr,gbproxy}-test: use ttcn3-docker-run too

Move the shared pipework script to the base image, and call it in
ttcn3-docker-run.sh if WAIT_FOR_NETDEV is set. Use ttcn3-docker-run.sh
as entrypoint in both Dockerfiles and remove the custom entrypoint
scripts (which are the same as ttcn3-docker-run.sh now).

Related: OS#5017
Change-Id: I2889abe94ed522a205890e5cb39e09cbebfbd820
The file was removedttcn3-gbproxy-test/docker-entrypoint.sh
The file was removedttcn3-fr-test/docker-entrypoint.sh
The file was modifiedttcn3-gbproxy-test/Dockerfile
The file was modifiedttcn3-fr-test/Dockerfile
The file was modifieddebian-stretch-titan/Dockerfile
The file was removedttcn3-fr-test/pipework
The file was addeddebian-stretch-titan/pipework
The file was removedttcn3-gbproxy-test/pipework
The file was modifieddebian-stretch-titan/ttcn3-docker-run.sh