From: Sage Weil <sage@newdream.net>
Date: Tue, 26 Jan 2021 16:19:20 +0000 (-0600)
Subject: qa/workunits/cephadm/test_cephadm: don't respawn for python versions
X-Git-Tag: v16.2.0~215^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=832e26f3a28a2a32fb0485294255432b8c5afe6b;p=ceph.git

qa/workunits/cephadm/test_cephadm: don't respawn for python versions

We aren't supporting python2 anymore.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 90676eb9b1a6e1593c37d158b8592e94ae30d655)
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index a02986567f46..999ba19bbdb7 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -35,36 +35,6 @@ if ! [ -x "$CEPHADM" ]; then
     exit 1
 fi
 
-# respawn ourselves with a shebang
-if [ -z "$PYTHON_KLUDGE" ]; then
-    # see which pythons we should test with
-    PYTHONS=""
-    which python3 && PYTHONS="$PYTHONS python3"
-    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
 CEPHADM_ARGS="$CEPHADM_ARGS --image $IMAGE_MASTER"