Change in osmo-dev[master]: ttcn3.sh: support IMAGE_SUFFIX=latest

osmith gerrit-no-reply at lists.osmocom.org
Fri Aug 13 07:30:41 UTC 2021


osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/25183 )

Change subject: ttcn3.sh: support IMAGE_SUFFIX=latest
......................................................................

ttcn3.sh: support IMAGE_SUFFIX=latest

Add the image suffix to the marker in run_docker() which indicates if
the testsuite docker container was already built (with all its
dependencies), so the script doesn't assume that everything is already
built if using without IMAGE_SUFFIX first and then switching to
IMAGE_SUFFIX=latest.

Add an usage example to README for IMAGE_SUFFIX=latest.

Change-Id: I867740831810324a7f5906a0548f0d04ecb9a0a1
---
M README
M ttcn3/ttcn3.sh
2 files changed, 2 insertions(+), 1 deletion(-)

Approvals:
  osmith: Looks good to me, approved; Verified



diff --git a/README b/README
index 5b3c0ce..7e34680 100644
--- a/README
+++ b/README
@@ -152,6 +152,7 @@
 Example usage:
 
   ./ttcn3/ttcn3.sh mgw
+  IMAGE_SUFFIX=latest ./ttcn3/ttcn3.sh mgw
 
 More about the testsuites:
 https://osmocom.org/projects/cellular-infrastructure/wiki/Titan_TTCN3_Testsuites
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index daa9561..b25c239 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -236,7 +236,7 @@
 	local hacks="${DIR_OSMODEV}/src/osmo-ttcn3-hacks"
 	local docker_dir="$(get_testsuite_dir_docker)"
 	local docker_name="$(basename "$docker_dir")"
-	local marker="${DIR_OSMODEV}/ttcn3/make/.docker.$docker_name"
+	local marker="${DIR_OSMODEV}/ttcn3/make/.docker.$docker_name.$IMAGE_SUFFIX"
 
 	# Skip building docker containers if this already ran
 	if [ -e "$marker" ]; then

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/25183
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I867740831810324a7f5906a0548f0d04ecb9a0a1
Gerrit-Change-Number: 25183
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210813/a51506df/attachment.htm>


More information about the gerrit-log mailing list