From: deepssin <deepssin@redhat.com>
Date: Thu, 26 Jun 2025 11:12:41 +0000 (-0400)
Subject: Add jq and curl in docker-compose Dockerfile
X-Git-Tag: 1.2.2~19^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0b5a5bc629180cf5318b77a8ecb4c131abbd057d;p=teuthology.git

Add jq and curl in docker-compose Dockerfile

Signed-off-by: deepssin <deepssin@redhat.com>
---

diff --git a/bootstrap b/bootstrap
index 6e6bfd052..307d4d391 100755
--- a/bootstrap
+++ b/bootstrap
@@ -127,10 +127,10 @@ fi
 PY_MAJOR=$($VENV/bin/python -c "import sys; print(sys.version_info[0])")
 PY_MINOR=$($VENV/bin/python -c "import sys; print(sys.version_info[1])")
 
-# Downgrade pip for older python versions
-if [ "$PY_MAJOR" -eq 3 ] && [ "$PY_MINOR" -lt 6 ]; then
-    $VENV/bin/python -m ensurepip
-    $VENV/bin/pip install pip==20.3.4 --force-reinstall
+# Python version check
+if [ "$PY_MAJOR" -ne 3 || "$PY_MINOR" -lt 10 ]; then
+    echo "Python version should be 3.10 or higher, found $PY_MAJOR.$PY_MINOR"
+    exit 1
 fi
 
 $VENV/bin/pip install packaging
diff --git a/docs/docker-compose/teuthology/Dockerfile b/docs/docker-compose/teuthology/Dockerfile
index 3be7a8d6a..bfd3882ab 100644
--- a/docs/docker-compose/teuthology/Dockerfile
+++ b/docs/docker-compose/teuthology/Dockerfile
@@ -5,6 +5,8 @@ ENV LANG=C.UTF-8
 RUN apt-get update && \
     apt-get install -y \
     git \
+    jq \
+    curl \
     qemu-utils \
     python3-dev \
     libssl-dev \