laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33379 ) Change subject: ttcn3-bts-test: fix config merge caching problem ...................................................................... ttcn3-bts-test: fix config merge caching problem Do "docker run" directly inside the Makefile, without wrapping it through the "run" target in make/Makefile. Use $(USER)/ttcn3-bts-test as image name, instead of $(REGISTRY)/$(USER)/ttcn3-bts-test. The $(REGISTRY)/ part is hardcoded in make/Makefile. This fixes TTCN3-centos-bts-test, because it uses the ttcn3-bts-test image that gets built in jenkins.sh before running 'make cfg'. Without the patch, an image downloaded some time ago from the registry gets used (a new image is not pulled), leading to the stale config. Fixes: OS#6065 Change-Id: Iebd81e814d84e8cf8360568419ceda7ffc38e742 --- M ttcn3-bts-test/Makefile 1 file changed, 26 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile index 26325f8..a6fc200 100644 --- a/ttcn3-bts-test/Makefile +++ b/ttcn3-bts-test/Makefile @@ -18,9 +18,12 @@ # Ensure that we always fetch up-to-date configuration files. # See https://www.gnu.org/software/make/manual/make.html#Force-Targets %src.cfg: FORCE_FETCH - $(MAKE) run \ - RUN_ARGS="-v $(CURDIR):/data --user $(UID)" \ - RUN_CMD="cp /osmo-ttcn3-hacks/bts/$(@:%.src.cfg=%.cfg) /data/$@" + docker run \ + --rm \ + --user $(UID) \ + -v $(CURDIR):/data \ + $(USER)/ttcn3-bts-test \ + cp /osmo-ttcn3-hacks/bts/$(@:%.src.cfg=%.cfg) /data/$@ FORCE_FETCH: generic/osmo-bts.gen.cfg: osmo-bts.src.cfg generic/osmo-bts.confmerge -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iebd81e814d84e8cf8360568419ceda7ffc38e742 Gerrit-Change-Number: 33379 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged