<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/14780">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">debian-repo-install-test: kill already running<br><br>The container grows heavily in size as the test runs, so make sure to<br>always kill existing ones (from stopped jobs) before starting a new<br>one. In order to do that, do not use $BUILD_TAG as container name,<br>which changes with every new jenkins run.<br><br>Related: OS#3369<br>Change-Id: Ide795092b656c9f0eb92a075d8f662944089019f<br>---<br>M debian-repo-install-test/jenkins.sh<br>1 file changed, 13 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian-repo-install-test/jenkins.sh b/debian-repo-install-test/jenkins.sh</span><br><span>index db71bc6..fbae4b9 100755</span><br><span>--- a/debian-repo-install-test/jenkins.sh</span><br><span>+++ b/debian-repo-install-test/jenkins.sh</span><br><span>@@ -3,27 +3,34 @@</span><br><span> docker_images_require "debian-repo-install-test"</span><br><span> </span><br><span> [ -z "$FEED" ] && FEED="nightly"</span><br><span style="color: hsl(120, 100%, 40%);">+CONTAINER="repo-install-test-$FEED"</span><br><span> </span><br><span> # Try to run "systemctl status" 10 times, kill the container on failure</span><br><span> check_if_systemd_is_running() {</span><br><span> for i in $(seq 1 10); do</span><br><span> sleep 1</span><br><span style="color: hsl(0, 100%, 40%);">- if docker exec "$BUILD_TAG" systemctl status; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if docker exec "$CONTAINER" systemctl status; then</span><br><span> return</span><br><span> fi</span><br><span> done</span><br><span> </span><br><span> echo "ERROR: systemd is not running properly."</span><br><span style="color: hsl(0, 100%, 40%);">- docker container kill "$BUILD_TAG"</span><br><span style="color: hsl(120, 100%, 40%);">+ docker container kill "$CONTAINER"</span><br><span> exit 1</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Kill already running container</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "$(docker inspect -f '{{.State.Running}}' "$CONTAINER" 2> /dev/null)" = "true" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ docker container kill "$CONTAINER"</span><br><span style="color: hsl(120, 100%, 40%);">+ sleep 1</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Run the container</span><br><span> # Note that this does not output anything. For debugging, add -it and remove &.</span><br><span> docker run --rm \</span><br><span> -v "$PWD/testdata:/testdata:ro" \</span><br><span> -v "$VOL_BASE_DIR:/data" \</span><br><span style="color: hsl(0, 100%, 40%);">- --name "${BUILD_TAG}" \</span><br><span style="color: hsl(120, 100%, 40%);">+ --name "$CONTAINER" \</span><br><span> -e FEED="$FEED" \</span><br><span> -e container=docker \</span><br><span> --tmpfs /run \</span><br><span>@@ -35,14 +42,14 @@</span><br><span> check_if_systemd_is_running</span><br><span> </span><br><span> # Run the test script</span><br><span style="color: hsl(0, 100%, 40%);">-docker exec "$BUILD_TAG" /testdata/repo-install-test.sh</span><br><span style="color: hsl(120, 100%, 40%);">+docker exec "$CONTAINER" /testdata/repo-install-test.sh</span><br><span> ret="$?"</span><br><span> </span><br><span> # Interactive shell</span><br><span> if [ -n "$INTERACTIVE" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- docker exec -it "$BUILD_TAG" bash</span><br><span style="color: hsl(120, 100%, 40%);">+ docker exec -it "$CONTAINER" bash</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill "$BUILD_TAG"</span><br><span style="color: hsl(120, 100%, 40%);">+docker container kill "$CONTAINER"</span><br><span> </span><br><span> exit $ret</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/14780">change 14780</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/14780"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ide795092b656c9f0eb92a075d8f662944089019f </div>
<div style="display:none"> Gerrit-Change-Number: 14780 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>