From bb8ec1fc1066e604b5695c0f8057e2b3adfa5cb2 Mon Sep 17 00:00:00 2001 From: Mick Semb Wever Date: Sun, 5 Apr 2020 10:50:26 +0200 Subject: [PATCH] Fix cqlsh tests running on jdk1.8 (regression from CASSANDRA-10190) patched by Mick Semb Wever; reviewed by Yuki Morishita for CASSANDRA-15662 --- pylib/cassandra-cqlsh-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pylib/cassandra-cqlsh-tests.sh b/pylib/cassandra-cqlsh-tests.sh index d3057596cd..56672f1bd5 100755 --- a/pylib/cassandra-cqlsh-tests.sh +++ b/pylib/cassandra-cqlsh-tests.sh @@ -34,7 +34,7 @@ export NUM_TOKENS="32" export CASSANDRA_DIR=${WORKSPACE} if [ -z "$CASSANDRA_USE_JDK11" ]; then - export CASSANDRA_USE_JDK11=true + export CASSANDRA_USE_JDK11=false fi # Loop to prevent failure due to maven-ant-tasks not downloading a jar.. @@ -53,7 +53,7 @@ fi # Set up venv with dtest dependencies set -e # enable immediate exit if venv setup fails -virtualenv --python=$PYTHON_VERSION --no-site-packages venv +virtualenv --python=$PYTHON_VERSION venv source venv/bin/activate pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt