]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa/workunits/cephadm/test_cephadm: don't respawn for python versions
authorSage Weil <sage@newdream.net>
Tue, 26 Jan 2021 16:19:20 +0000 (10:19 -0600)
committerSage Weil <sage@newdream.net>
Tue, 26 Jan 2021 16:19:20 +0000 (10:19 -0600)
We aren't supporting python2 anymore.

Signed-off-by: Sage Weil <sage@newdream.net>
qa/workunits/cephadm/test_cephadm.sh

index a02986567f461736b4fc90c036fd00a5f3f9fc4e..999ba19bbdb7c3d897954779040b34b06492fd1c 100755 (executable)
@@ -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"