From: Sage Weil <sage@redhat.com>
Date: Wed, 18 Dec 2019 17:08:42 +0000 (-0600)
Subject: qa/workunits/cephadm/test_cephadm.sh: detect python3 and python2
X-Git-Tag: v15.1.0~400^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e43c7cd6dd535b3d9b3eed7314cc556c2e423889;p=ceph.git

qa/workunits/cephadm/test_cephadm.sh: detect python3 and python2

Only test on whichever pythons are available on the host.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index 20cb382fb016..fed89a25c23c 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -37,25 +37,34 @@ if ! [ -x "$CEPHADM" ]; then
 fi
 
 # respawn ourselves with a shebang
-PYTHONS="python3 python2"  # which pythons we test
 if [ -z "$PYTHON_KLUDGE" ]; then
-   TMPBINDIR=$(mktemp -d)
-   trap "rm -rf $TMPBINDIR" EXIT
-   ORIG_CEPHADM="$CEPHADM"
-   CEPHADM="$TMPBINDIR/cephadm"
-   for p in $PYTHONS; do
-       echo "=== re-running with $p ==="
-       ln -s `which $p` $TMPBINDIR/python
-       echo "#!$TMPBINDIR/python" > $CEPHADM
-       cat $ORIG_CEPHADM >> $CEPHADM
-       chmod 700 $CEPHADM
-       $TMPBINDIR/python --version
-       PYTHON_KLUDGE=1 CEPHADM=$CEPHADM $0
-       rm $TMPBINDIR/python
-   done
-   rm -rf $TMPBINDIR
-   echo "PASS with all of: $PYTHONS"
-   exit 0
+    # see which pythons we should test with
+    PYTHONS=""
+    which python3 && PYTHONS="$PYTHONS python3"
+    which python2 && PYTHONS="$PYTHONS python2"
+    echo "PYTHONS $PYTHONS"
+    if [ -z $PYTHONS ]; then
+	echo "No PYTHONS found!"
+	exit 1
+    fi
+
+    TMPBINDIR=$(mktemp -d)
+    trap "rm -rf $TMPBINDIR" EXIT
+    ORIG_CEPHADM="$CEPHADM"
+    CEPHADM="$TMPBINDIR/cephadm"
+    for p in $PYTHONS; do
+	echo "=== re-running with $p ==="
+	ln -s `which $p` $TMPBINDIR/python
+	echo "#!$TMPBINDIR/python" > $CEPHADM
+	cat $ORIG_CEPHADM >> $CEPHADM
+	chmod 700 $CEPHADM
+	$TMPBINDIR/python --version
+	PYTHON_KLUDGE=1 CEPHADM=$CEPHADM $0
+	rm $TMPBINDIR/python
+    done
+    rm -rf $TMPBINDIR
+    echo "PASS with all of: $PYTHONS"
+    exit 0
 fi
 
 # add image to args