Standalone Jenkinsfile

patch by Mick Semb Wever, Aleks Volochnev; reviewed by XXX for CASSANDRA-18594 Co-authored-by: Aleksandr Volochnev <[email protected]>
thelastpickle · Jan 20, 2024 · c1a0e0d · c1a0e0d
1 parent f54177b
commit c1a0e0d
Show file tree

Hide file tree

Showing 6 changed files with 477 additions and 696 deletions.
diff --git a/.build/check-code.sh b/.build/check-code.sh
@@ -24,5 +24,5 @@ command -v ant >/dev/null 2>&1 || { echo >&2 "ant needs to be installed"; exit 1
 [ -f "${CASSANDRA_DIR}/build.xml" ] || { echo >&2 "${CASSANDRA_DIR}/build.xml must exist"; exit 1; }
 
 # execute
-ant -f "${CASSANDRA_DIR}/build.xml" check dependency-check
+ant -f "${CASSANDRA_DIR}/build.xml" check #dependency-check FIXME uncomment when working again
 exit $?
diff --git a/.build/docker/_docker_run.sh b/.build/docker/_docker_run.sh
@@ -118,7 +118,7 @@ docker_command="export ANT_OPTS=\"-Dbuild.dir=\${DIST_DIR} ${CASSANDRA_DOCKER_AN
 # run without the default seccomp profile
 # re-use the host's maven repository
 container_id=$(docker run --name ${container_name} -d --security-opt seccomp=unconfined --rm \
- -v "${cassandra_dir}":/home/build/cassandra -v ~/.m2/repository/:/home/build/.m2/repository/ -v "${build_dir}":/dist \
+ -v "${cassandra_dir}":/home/build/cassandra -v ${HOME}/.m2/repository/:/home/build/.m2/repository/ -v "${build_dir}":/dist \
  ${docker_volume_opt} \
  ${image_name} sleep 1h)
 

diff --git a/.build/run-python-dtests.sh b/.build/run-python-dtests.sh
@@ -167,7 +167,7 @@ pushd ${CASSANDRA_DIR}/ >/dev/null
 # remove <testsuites> wrapping elements. `ant generate-unified-test-report` doesn't like it`
 sed -r "s/<[\/]?testsuites>//g" ${DIST_DIR}/test/output/nosetests.xml > ${TMPDIR}/nosetests.xml
 cat ${TMPDIR}/nosetests.xml > ${DIST_DIR}/test/output/nosetests.xml
-ant -quiet -silent generate-unified-test-report
+ant -quiet -silent generate-test-report
 popd >/dev/null
 
 ################################

diff --git a/.build/run-tests.sh b/.build/run-tests.sh
@@ -186,7 +186,8 @@ _main() {
  [[ "/" == "${DIST_DIR}" ]] || rm -rf "${DIST_DIR}/test/{html,output,logs}"
 
  # cheap trick to ensure dependency libraries are in place. allows us to stash only project specific build artifacts.
- ant -quiet -silent resolver-dist-lib
+ # also recreate some of the non-build files we need
+ ant -quiet -silent resolver-dist-lib _createVersionPropFile
 
  case ${target} in
  "stress-test")
@@ -262,7 +263,7 @@ _main() {
  esac
 
  # merge all unit xml files into one, and print summary test numbers
- ant -quiet -silent generate-unified-test-report
+ ant -quiet -silent generate-test-report
 
  popd >/dev/null
 }