1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
--- pylib/cassandra-cqlsh-tests.sh.orig 2022-01-03 17:11:14 UTC
+++ pylib/cassandra-cqlsh-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/usr/local/bin/bash -x
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -15,7 +15,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
################################
#
@@ -24,9 +23,13 @@
################################
WORKSPACE=$1
-PYTHON_VERSION=$2
-JAVA_HOME=$3
+JAVA_HOME=$2
+REPO_DIR=$3
+PYTHON_CMD=$4
+REPO_DIR=$5
+PYTHON_VERSION=python3
+
if [ "${WORKSPACE}" = "" ]; then
echo "Specify Cassandra source directory"
exit
@@ -65,7 +68,7 @@ fi
# Loop to prevent failure due to maven-ant-tasks not downloading a jar..
for x in $(seq 1 3); do
- ant -buildfile ${CASSANDRA_DIR}/build.xml realclean jar
+ ${ANT_CMD} -buildfile ${CASSANDRA_DIR}/build.xml realclean jar -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR}
RETURN="$?"
if [ "${RETURN}" -eq "0" ]; then
break
@@ -79,7 +82,7 @@ fi
# Set up venv with dtest dependencies
set -e # enable immediate exit if venv setup fails
-virtualenv --python=$PYTHON_VERSION venv
+virtualenv --python=$PYTHON_CMD venv
source venv/bin/activate
pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt
pip freeze
@@ -120,7 +123,7 @@ case "${pre_or_post_cdc}" in
;;
esac
-ccm start --wait-for-binary-proto
+ccm start --wait-for-binary-proto --root
cd ${CASSANDRA_DIR}/pylib/cqlshlib/
|
