WIP: temporary state

Change-Id: Ic5f5fd9c1493591e96754f6057e23ec9ceb264a1

common/ttcn3-docker-prepare.sh

@@ -15,15 +15,15 @@ shift
 
 cd /osmo-ttcn3-hacks
 
-git fetch
-git checkout "$OSMO_TTCN3_BRANCH"
+: #git fetch
+: #git checkout "$OSMO_TTCN3_BRANCH"
 
 if git symbolic-ref -q HEAD; then
-	git reset --hard origin/"$OSMO_TTCN3_BRANCH"
+: #	git reset --hard origin/"$OSMO_TTCN3_BRANCH"
 fi
 
-git rev-parse --abbrev-ref HEAD
-git rev-parse HEAD
+: #git rev-parse --abbrev-ref HEAD
+: #git rev-parse HEAD
 
 # Update deps if Makefile changed since last 'make deps' (e.g. because
 # OSMO_TTCN3_BRANCH is different). The Dockerfile does the initial 'make deps'

debian-bullseye-titan/Dockerfile

@@ -55,14 +55,12 @@ RUN	git config --global user.email docker@dock.er && \
 	git config --global user.name "Dock Er"
 
 # clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017)
-RUN	git clone https://gerrit.osmocom.org/osmo-ttcn3-hacks && \
-	make -j8 -C /osmo-ttcn3-hacks deps
+ADD	osmo-ttcn3-hacks /osmo-ttcn3-hacks
+RUN	make -j8 -C /osmo-ttcn3-hacks deps
 ADD	https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/refs/heads/master/deps/Makefile?format=TEXT /tmp/deps-Makefile
-RUN	if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \
-		cd /osmo-ttcn3-hacks && \
-		git pull && \
-		make -j8 deps; \
-	fi
+# RUN	if false; then \
+RUN	cd /osmo-ttcn3-hacks && \
+		make -j8 deps
 
 ADD	.common/ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare
 ADD	.common/ttcn3-docker-run.sh /usr/local/bin/ttcn3-docker-run

scripts/docker-playground_adapt

@@ -1,6 +1,6 @@
 #!/bin/bash
 # set -x
-# PS4='Line ${LINENO}: '
+ PS4='Line ${LINENO}: '
 
 RESTORE_NOTE_TC="Note: If --restore is given, then for restoring purposes, it suffices to append a dot to the testsuite name \(<TTCN3_TESTSUITE>.\)"