Started by an SCM change183ce824cc3e17552cc963439f2a25ede39e0c62cdace824cc3e17552cc963439f2a25ede39e0c62cdarefs/remotes/origin/masterce824cc3e17552cc963439f2a25ede39e0c62cdace824cc3e17552cc963439f2a25ede39e0c62cdarefs/remotes/origin/masterce824cc3e17552cc963439f2a25ede39e0c62cdace824cc3e17552cc963439f2a25ede39e0c62cdarefs/remotes/origin/mastergit://git.osmocom.org/docker-playgroundfalse#183510255update-osmo-ci-on-slaves-dp #183183falsefalse183394410SUCCESS1613056268543https://jenkins.osmocom.org/jenkins/view/gerrit/job/update-osmo-ci-on-slaves-dp/183/build2-deb9build-ansible- ttcn3-stp-test/Dockerfilettcn3-msc-test/Dockerfilettcn3-bsc-test/Dockerfilettcn3-sgsn-test/Dockerfilettcn3-gbproxy-test/Dockerfilettcn3-bscnat-test/Dockerfilettcn3-sip-test/Dockerfilettcn3-hlr-test/Dockerfilettcn3-remsim-test/Dockerfilettcn3-mgw-test/Dockerfilettcn3-bts-test/Dockerfilettcn3-fr-test/Dockerfilettcn3-sccp-test/Dockerfilettcn3-nitb-sysinfo/Dockerfilettcn3-smlc-test/Dockerfilettcn3-pcu-test/Dockerfiledb3f98113cbdeb0110ca0b9ba01cd12d66d97e341613054740000https://jenkins.osmocom.org/jenkins/user/osmithOliver Smithosmith@sysmocom.dettcn3: 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
2021-02-11 15:45:40 +0100db3f98113cbdeb0110ca0b9ba01cd12d66d97e34ttcn3: remove /root/projects/git symlinkeditttcn3-msc-test/Dockerfileeditttcn3-bts-test/Dockerfileeditttcn3-mgw-test/Dockerfileeditttcn3-remsim-test/Dockerfileeditttcn3-sgsn-test/Dockerfileeditttcn3-stp-test/Dockerfileeditttcn3-gbproxy-test/Dockerfileeditttcn3-bscnat-test/Dockerfileeditttcn3-smlc-test/Dockerfileeditttcn3-sccp-test/Dockerfileeditttcn3-sip-test/Dockerfileeditttcn3-bsc-test/Dockerfileeditttcn3-fr-test/Dockerfileeditttcn3-hlr-test/Dockerfileeditttcn3-nitb-sysinfo/Dockerfileeditttcn3-pcu-test/Dockerfile
- debian-stretch-titan/Dockerfilettcn3-stp-test/Dockerfilettcn3-msc-test/Dockerfilettcn3-bsc-test/Dockerfilettcn3-sgsn-test/Dockerfilettcn3-gbproxy-test/Dockerfilettcn3-bscnat-test/Dockerfilettcn3-sip-test/Dockerfilettcn3-hlr-test/Dockerfilettcn3-remsim-test/Dockerfilettcn3-mgw-test/Dockerfilettcn3-fr-test/Dockerfilettcn3-bts-test/Dockerfilettcn3-ggsn-test/Dockerfilettcn3-sccp-test/Dockerfilettcn3-nitb-sysinfo/Dockerfilettcn3-smlc-test/Dockerfilettcn3-pcu-test/Dockerfile61fed0ad3959b0b5d841bad9d99217a20cb9ffaa1613054740000https://jenkins.osmocom.org/jenkins/user/osmithOliver Smithosmith@sysmocom.dettcn3: 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
2021-02-11 15:45:40 +010061fed0ad3959b0b5d841bad9d99217a20cb9ffaattcn3: move initial clone to debian-stretch-titaneditttcn3-nitb-sysinfo/Dockerfileeditttcn3-bsc-test/Dockerfileeditttcn3-bscnat-test/Dockerfileeditttcn3-stp-test/Dockerfileeditttcn3-remsim-test/Dockerfileeditttcn3-hlr-test/Dockerfileeditttcn3-msc-test/Dockerfileeditttcn3-sgsn-test/Dockerfileeditttcn3-pcu-test/Dockerfileeditttcn3-ggsn-test/Dockerfileeditttcn3-sip-test/Dockerfileeditttcn3-sccp-test/Dockerfileeditdebian-stretch-titan/Dockerfileeditttcn3-fr-test/Dockerfileeditttcn3-gbproxy-test/Dockerfileeditttcn3-mgw-test/Dockerfileeditttcn3-bts-test/Dockerfileeditttcn3-smlc-test/Dockerfile
- debian-stretch-titan/Dockerfile73d23109b14aaf2031b60cc06eec3573ae4920bc1613054740000https://jenkins.osmocom.org/jenkins/user/osmithOliver Smithosmith@sysmocom.dedebian-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
2021-02-11 15:45:40 +010073d23109b14aaf2031b60cc06eec3573ae4920bcdebian-stretch-titan: update deps on changeeditdebian-stretch-titan/Dockerfile
- debian-stretch-titan/Dockerfilettcn3-stp-test/Dockerfiledebian-stretch-titan/ttcn3-docker-prepare.shttcn3-msc-test/Dockerfilettcn3-bsc-test/Dockerfilettcn3-gbproxy-test/Dockerfilettcn3-sgsn-test/Dockerfilettcn3-bscnat-test/Dockerfilettcn3-sip-test/Dockerfilettcn3-hlr-test/Dockerfilettcn3-remsim-test/Dockerfilettcn3-mgw-test/Dockerfilettcn3-bts-test/Dockerfilettcn3-fr-test/Dockerfilettcn3-ggsn-test/Dockerfilettcn3-sccp-test/Dockerfilettcn3-nitb-sysinfo/Dockerfilettcn3-smlc-test/Dockerfilettcn3-pcu-test/Dockerfile892d910444f7572da9591305dce0e630aeec31041613054740000https://jenkins.osmocom.org/jenkins/user/osmithOliver Smithosmith@sysmocom.dettcn3: 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
2021-02-11 15:45:40 +0100892d910444f7572da9591305dce0e630aeec3104ttcn3: move prepare code to shared scripteditttcn3-msc-test/Dockerfileeditttcn3-ggsn-test/Dockerfileeditdebian-stretch-titan/Dockerfileeditttcn3-stp-test/Dockerfileeditttcn3-nitb-sysinfo/Dockerfileeditttcn3-bsc-test/Dockerfileeditttcn3-gbproxy-test/Dockerfileeditttcn3-remsim-test/Dockerfileeditttcn3-smlc-test/Dockerfileeditttcn3-sgsn-test/Dockerfileadddebian-stretch-titan/ttcn3-docker-prepare.sheditttcn3-bscnat-test/Dockerfileeditttcn3-hlr-test/Dockerfileeditttcn3-bts-test/Dockerfileeditttcn3-fr-test/Dockerfileeditttcn3-mgw-test/Dockerfileeditttcn3-sccp-test/Dockerfileeditttcn3-pcu-test/Dockerfileeditttcn3-sip-test/Dockerfile
- debian-stretch-titan/ttcn3-docker-prepare.sh9206cf6b280af554ffabba2244fb733c44a0a8741613054740000https://jenkins.osmocom.org/jenkins/user/osmithOliver Smithosmith@sysmocom.dedebian-stretch-titan: prepare: run 'make deps'
Run 'make deps' in ttcn3-docker-prepare.sh, if needed.
Related: OS#5017
Change-Id: I9085203b27d310b63a035fd71f7c2a78d02710d4
2021-02-11 15:45:40 +01009206cf6b280af554ffabba2244fb733c44a0a874debian-stretch-titan: prepare: run 'make deps'editdebian-stretch-titan/ttcn3-docker-prepare.sh
- ttcn3-stp-test/Dockerfiledebian-stretch-titan/ttcn3-docker-prepare.shttcn3-msc-test/Dockerfilettcn3-bsc-test/Dockerfilettcn3-gbproxy-test/Dockerfilettcn3-sgsn-test/Dockerfilettcn3-sip-test/Dockerfilettcn3-bscnat-test/Dockerfilettcn3-hlr-test/Dockerfilettcn3-remsim-test/Dockerfilettcn3-mgw-test/Dockerfilettcn3-fr-test/Dockerfilettcn3-bts-test/Dockerfilettcn3-sccp-test/Dockerfilettcn3-ggsn-test/Dockerfilettcn3-smlc-test/Dockerfilettcn3-pcu-test/Dockerfile914a486ef1c5a5b16f6f0f3bce2c327ea54fcac21613054740000https://jenkins.osmocom.org/jenkins/user/osmithOliver Smithosmith@sysmocom.dedebian-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
2021-02-11 15:45:40 +0100914a486ef1c5a5b16f6f0f3bce2c327ea54fcac2debian-stretch-titan: prepare: start/stop linkseditttcn3-sccp-test/Dockerfileeditttcn3-sip-test/Dockerfileeditttcn3-msc-test/Dockerfileeditttcn3-bsc-test/Dockerfileeditttcn3-ggsn-test/Dockerfileeditttcn3-pcu-test/Dockerfileeditttcn3-remsim-test/Dockerfileeditttcn3-fr-test/Dockerfileeditttcn3-mgw-test/Dockerfileeditttcn3-bscnat-test/Dockerfileeditdebian-stretch-titan/ttcn3-docker-prepare.sheditttcn3-smlc-test/Dockerfileeditttcn3-gbproxy-test/Dockerfileeditttcn3-sgsn-test/Dockerfileeditttcn3-hlr-test/Dockerfileeditttcn3-stp-test/Dockerfileeditttcn3-bts-test/Dockerfile
- debian-stretch-titan/Dockerfilettcn3-stp-test/Dockerfilettcn3-msc-test/Dockerfilettcn3-bsc-test/Dockerfilettcn3-sgsn-test/Dockerfilettcn3-sip-test/Dockerfilettcn3-bscnat-test/Dockerfilettcn3-hlr-test/Dockerfiledebian-stretch-titan/ttcn3-docker-run.shttcn3-remsim-test/Dockerfilettcn3-mgw-test/Dockerfilettcn3-bts-test/Dockerfilettcn3-ggsn-test/Dockerfilettcn3-sccp-test/Dockerfilettcn3-nitb-sysinfo/Dockerfilettcn3-smlc-test/Dockerfilettcn3-pcu-test/Dockerfile2b38b8e7791706216c489d63b6190cbeef0271381613054740000https://jenkins.osmocom.org/jenkins/user/osmithOliver Smithosmith@sysmocom.dettcn3: 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
2021-02-11 15:45:40 +01002b38b8e7791706216c489d63b6190cbeef027138ttcn3: move shared run code to scripteditttcn3-ggsn-test/Dockerfileeditttcn3-sip-test/Dockerfileeditttcn3-stp-test/Dockerfileadddebian-stretch-titan/ttcn3-docker-run.sheditttcn3-msc-test/Dockerfileeditttcn3-sgsn-test/Dockerfileeditttcn3-smlc-test/Dockerfileeditttcn3-hlr-test/Dockerfileeditdebian-stretch-titan/Dockerfileeditttcn3-mgw-test/Dockerfileeditttcn3-pcu-test/Dockerfileeditttcn3-sccp-test/Dockerfileeditttcn3-bts-test/Dockerfileeditttcn3-bsc-test/Dockerfileeditttcn3-bscnat-test/Dockerfileeditttcn3-remsim-test/Dockerfileeditttcn3-nitb-sysinfo/Dockerfile
- ttcn3-fr-test/pipeworkdebian-stretch-titan/Dockerfiledebian-stretch-titan/ttcn3-docker-run.shttcn3-gbproxy-test/pipeworkttcn3-fr-test/Dockerfilettcn3-fr-test/docker-entrypoint.shttcn3-gbproxy-test/Dockerfiledebian-stretch-titan/pipeworkttcn3-gbproxy-test/docker-entrypoint.shce824cc3e17552cc963439f2a25ede39e0c62cda1613054740000https://jenkins.osmocom.org/jenkins/user/osmithOliver Smithosmith@sysmocom.dettcn3-{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
2021-02-11 15:45:40 +0100ce824cc3e17552cc963439f2a25ede39e0c62cdattcn3-{fr,gbproxy}-test: use ttcn3-docker-run toodeletettcn3-fr-test/pipeworkdeletettcn3-gbproxy-test/docker-entrypoint.sheditdebian-stretch-titan/Dockerfileeditttcn3-fr-test/Dockerfileadddebian-stretch-titan/pipeworkdeletettcn3-gbproxy-test/pipeworkeditdebian-stretch-titan/ttcn3-docker-run.sheditttcn3-gbproxy-test/Dockerfiledeletettcn3-fr-test/docker-entrypoint.sh
githttps://jenkins.osmocom.org/jenkins/user/osmithOliver Smith