From: Zack Cerza <zack@redhat.com>
Date: Thu, 24 Mar 2022 23:11:11 +0000 (-0600)
Subject: docker-compose: Populate "real" testnodes
X-Git-Tag: 1.2.0~190^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea8f93c403ca3daefe88a6a34fd0cb2c9501f62b;p=teuthology.git

docker-compose: Populate "real" testnodes

... if we're using them, that is.

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

diff --git a/docs/docker-compose/docker-compose.yml b/docs/docker-compose/docker-compose.yml
index c7cd85f7..70866ecd 100644
--- a/docs/docker-compose/docker-compose.yml
+++ b/docs/docker-compose/docker-compose.yml
@@ -68,6 +68,8 @@ services:
         - beanstalk
     environment:
       SSH_PRIVKEY:
+      MACHINE_TYPE:
+      TESTNODES:
   testnode:
     build:
       context: .
diff --git a/docs/docker-compose/teuthology.sh b/docs/docker-compose/teuthology.sh
index ea4e0a2c..ff2250ac 100755
--- a/docs/docker-compose/teuthology.sh
+++ b/docs/docker-compose/teuthology.sh
@@ -4,11 +4,17 @@ set -e
 echo "$SSH_PRIVKEY" > $HOME/.ssh/id_ed25519
 source /teuthology/virtualenv/bin/activate
 set -x
+if [ -n "$TESTNODES" ]; then
+    for node in $(echo $TESTNODES | tr , ' '); do
+        teuthology-update-inventory $node
+    done
+fi
+export MACHINE_TYPE=${MACHINE_TYPE:-testnode}
 teuthology-suite -v \
     --ceph-repo https://github.com/ceph/ceph.git \
     --suite-repo https://github.com/ceph/ceph.git \
     -c master \
-    -m testnode \
+    -m $MACHINE_TYPE \
     --limit 1 \
     -n 100 \
     --suite teuthology:no-ceph \
@@ -22,5 +28,5 @@ teuthology-suite -v \
     /teuthology/custom_conf.yaml
 teuthology-dispatcher -v \
     --log-dir /teuthology/log \
-    --tube testnode \
+    --tube $MACHINE_TYPE \
     --exit-on-empty-queue
\ No newline at end of file