This is an automated email from the ASF dual-hosted git repository. netudima pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 66a383fc95101e6f5734e01fc2579bd753f2b1de Merge: 8565e8d699 5063e90ba1 Author: Dmitry Konstantinov <[email protected]> AuthorDate: Wed Oct 28 17:47:31 2026 +0000 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Rebuild truncated dtest jars in jvm-dtest-upgrade instead of reusing them .build/run-tests.sh | 12 ++++++++++-- .jenkins/Jenkinsfile | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --cc .build/run-tests.sh index 7e9f68bfe9,e4574e872e..a6629c06b5 --- a/.build/run-tests.sh +++ b/.build/run-tests.sh @@@ -197,11 -197,18 +197,19 @@@ _get_env_var() echo "${BASH_REMATCH[1]}" } + # a jar's table of contents is written at its end, so a truncated jar (e.g. left by an interrupted Jenkins unstash) cannot be listed + _is_valid_jar() { + [ -f "${1}" ] || return 1 + jar tf "${1}" >/dev/null 2>&1 && return 0 + echo "WARNING: ${1} is not a readable jar, rebuilding it" + return 1 + } + _build_all_dtest_jars() { + # build the dtest-jar for the branch under test. remember to `ant clean` if you want a new dtest jar built dtest_jar_version=$(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p') - if [ -f "${DIST_DIR}/dtest-${dtest_jar_version}.jar" ] ; then + if _is_valid_jar "${DIST_DIR}/dtest-${dtest_jar_version}.jar" ; then echo "Skipping dtest jar build for branch under test as ${DIST_DIR}/dtest-${dtest_jar_version}.jar already exists" else ant jar dtest-jar ${ANT_TEST_OPTS} -Dbuild.dir=${TMP_DIR}/cassandra-dtest-jars/build --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
