From: Zack Cerza <zack@redhat.com>
Date: Mon, 21 Mar 2022 19:39:57 +0000 (-0600)
Subject: docker-compose: Exit after jobs are done
X-Git-Tag: 1.2.0~190^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8505d3472ca5df16f1502bf0b2acd3ea6d11d7d7;p=teuthology.git

docker-compose: Exit after jobs are done

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/docs/docker-compose/start.sh b/docs/docker-compose/start.sh
index 9c71889af..25ae832a9 100755
--- a/docs/docker-compose/start.sh
+++ b/docs/docker-compose/start.sh
@@ -30,4 +30,9 @@ ssh-keygen -t ed25519 -N '' -f $SSH_PRIVKEY_PATH
 export SSH_PRIVKEY=$(cat $SSH_PRIVKEY_PATH)
 export SSH_PUBKEY=$(cat $SSH_PRIVKEY_PATH.pub)
 
-docker-compose up --build
+trap "docker-compose down" SIGINT
+docker-compose up \
+    --build \
+    --abort-on-container-exit \
+    --exit-code-from teuthology
+docker-compose down
\ No newline at end of file
diff --git a/docs/docker-compose/teuthology.sh b/docs/docker-compose/teuthology.sh
index affaf8236..ea4e0a2cd 100755
--- a/docs/docker-compose/teuthology.sh
+++ b/docs/docker-compose/teuthology.sh
@@ -22,5 +22,5 @@ teuthology-suite -v \
     /teuthology/custom_conf.yaml
 teuthology-dispatcher -v \
     --log-dir /teuthology/log \
-    --tube testnode
-tail -f /dev/null
\ No newline at end of file
+    --tube testnode \
+    --exit-on-empty-queue
\ No newline at end of file