From 90676eb9b1a6e1593c37d158b8592e94ae30d655 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 26 Jan 2021 10:19:20 -0600 Subject: [PATCH] qa/workunits/cephadm/test_cephadm: don't respawn for python versions We aren't supporting python2 anymore. Signed-off-by: Sage Weil --- qa/workunits/cephadm/test_cephadm.sh | 30 ---------------------------- 1 file changed, 30 deletions(-) diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh index a02986567f4..999ba19bbdb 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" -- 2.39.5