From: Zack Cerza Date: Tue, 4 Jun 2024 22:44:12 +0000 (-0600) Subject: testnode_start.sh: Detect operating system X-Git-Tag: 1.2.0~36^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfdecda3c7af896e2d85a730dbf4108b9efd3ce8;p=teuthology.git testnode_start.sh: Detect operating system ... instead of hardcoding, which is more error-prone. Signed-off-by: Zack Cerza --- diff --git a/docs/docker-compose/testnode/testnode_start.sh b/docs/docker-compose/testnode/testnode_start.sh index d29c3b6d0..196d8a76f 100755 --- a/docs/docker-compose/testnode/testnode_start.sh +++ b/docs/docker-compose/testnode/testnode_start.sh @@ -3,7 +3,10 @@ set -x echo "$SSH_PUBKEY" > /root/.ssh/authorized_keys echo "$SSH_PUBKEY" > /home/ubuntu/.ssh/authorized_keys chown ubuntu /home/ubuntu/.ssh/authorized_keys -payload="{\"name\": \"$(hostname)\", \"machine_type\": \"testnode\", \"up\": true, \"locked\": false, \"os_type\": \"ubuntu\", \"os_version\": \"20.04\"}" +if [ $ID = 'centos' ]; then + VERSION_ID=${VERSION_ID}.stream +fi +payload="{\"name\": \"$(hostname)\", \"machine_type\": \"testnode\", \"up\": true, \"locked\": false, \"os_type\": \"${ID}\", \"os_version\": \"${VERSION_ID}\"}" for i in $(seq 1 5); do echo "attempt $i" curl -v -f -d "$payload" http://paddles:8080/nodes/ && break