This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
new b67d04b cassandra-cqlsh-tests.sh should return different return codes
on circle vs jenkins
b67d04b is described below
commit b67d04b6fe311d8c923d125c722e7a094a921f0c
Author: Bereng <[email protected]>
AuthorDate: Wed May 5 12:32:38 2021 +0200
cassandra-cqlsh-tests.sh should return different return codes on circle vs
jenkins
patch by Mick Semb Wever; reviewed by Berenguer Blasi for CASSANDRA-16655
---
pylib/cassandra-cqlsh-tests.sh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/pylib/cassandra-cqlsh-tests.sh b/pylib/cassandra-cqlsh-tests.sh
index 2458a3d..7904166 100755
--- a/pylib/cassandra-cqlsh-tests.sh
+++ b/pylib/cassandra-cqlsh-tests.sh
@@ -61,9 +61,10 @@ else
TESTSUITE_NAME="${TESTSUITE_NAME}.jdk8"
fi
+ant -buildfile ${CASSANDRA_DIR}/build.xml realclean
# 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 -buildfile ${CASSANDRA_DIR}/build.xml jar
RETURN="$?"
if [ "${RETURN}" -eq "0" ]; then
break
@@ -143,4 +144,10 @@ mv nosetests.xml ${WORKSPACE}/cqlshlib.xml
# /virtualenv
deactivate
-exit ${RETURN}
+# circleci needs non-zero exit on failures, jenkins need zero exit to process
the test failures
+if ! command -v circleci >/dev/null 2>&1
+then
+ exit 0
+else
+ exit ${RETURN}
+fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
