(cassandra-builds) branch trunk updated: Sanitise nosetests.xml so <5.0 CI builds are including dtests results

[mck]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git


The following commit(s) were added to refs/heads/trunk by this push:
     new cd09ca9  Sanitise nosetests.xml so <5.0 CI builds are including dtests 
results
cd09ca9 is described below

commit cd09ca9c1ca85c4c9550657e20896bea62cc3ca9
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Mon Feb 3 20:42:04 2025 +0100

    Sanitise nosetests.xml so <5.0 CI builds are including dtests results
    
    ci-cassandra.a.o console logs are filled with `nosetests.xml is not a valid 
testsuite XML document`
    
     patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-20284
---
 build-scripts/cassandra-dtest-pytest.sh              | 6 ++++++
 build-scripts/cassandra-test-report.sh               | 2 +-
 docker/testing/ubuntu2204_java_driver_testing.docker | 2 +-
 jenkins-dsl/cassandra_job_dsl_seed.groovy            | 5 ++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/build-scripts/cassandra-dtest-pytest.sh 
b/build-scripts/cassandra-dtest-pytest.sh
index 824d09a..e602240 100755
--- a/build-scripts/cassandra-dtest-pytest.sh
+++ b/build-scripts/cassandra-dtest-pytest.sh
@@ -115,6 +115,12 @@ PYTEST_OPTS="-vv --log-cli-level=DEBUG 
--junit-xml=nosetests.xml --junit-prefix=
 
 pytest ${PYTEST_OPTS} --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS} 
${SPLIT_TESTS} 2>&1 | tee -a ${WORKSPACE}/test_stdout.txt
 
+# remove <testsuites> wrapping elements, and update testsuite name
+sed -r "s/<[\/]?testsuites>//g" nosetests.xml > ${TMPDIR}/nosetests.xml
+cat ${TMPDIR}/nosetests.xml > nosetests.xml
+sed "s/testsuite name=\"Cassandra dtests\"/testsuite 
name=\"${DTEST_TARGET}_jdk${java_version}_python${python_version}_cython${cython}_$(uname
 -m)${SPLIT_STRING}\"/g" nosetests.xml > ${TMPDIR}/nosetests.xml
+cat ${TMPDIR}/nosetests.xml > nosetests.xml
+
 # tar up any ccm logs for easy retrieval
 tar -cJf ccm_logs.tar.xz ${TMPDIR}/*/test/*/logs/*
 
diff --git a/build-scripts/cassandra-test-report.sh 
b/build-scripts/cassandra-test-report.sh
index 17ad876..6cc5a9c 100755
--- a/build-scripts/cassandra-test-report.sh
+++ b/build-scripts/cassandra-test-report.sh
@@ -2,4 +2,4 @@
 
 # merge all the unit test xml files into one TESTS-TestSuites.xml file (which 
will get archived at nightlies.a.o)
 #  set java heap max to known jenkins executor available memory
-ANT_OPTS="-Xmx15G ${ANT_OPTS}" ant -quiet -silent -f 
./cassandra-builds/build-scripts/cassandra-test-report.xml || ( echo "WARN 
failed to unify test results" && touch TESTS-TestSuites.xml )
+ANT_OPTS="-Xmx15G ${ANT_OPTS}" ant -quiet -silent -f $(dirname 
"$0")/cassandra-test-report.xml || ( echo "WARN failed to unify test results" 
&& touch TESTS-TestSuites.xml )
diff --git a/docker/testing/ubuntu2204_java_driver_testing.docker 
b/docker/testing/ubuntu2204_java_driver_testing.docker
index e9057c4..a0badd3 100644
--- a/docker/testing/ubuntu2204_java_driver_testing.docker
+++ b/docker/testing/ubuntu2204_java_driver_testing.docker
@@ -49,7 +49,7 @@ RUN echo "export JAVA8_HOME=$(jabba which openjdk@1.8.0-292)" 
>> ~/env.txt && \
     echo "jabba use openjdk@1.8.0-292" >> ~/env.txt
 
 # ccm
-RUN git clone https://github.com/riptano/ccm.git  && \
+RUN git clone https://github.com/apache/cassandra-ccm.git  && \
     cd ccm && \
     pip install -e .
 
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy 
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index ca78270..e59db38 100755
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -11,10 +11,9 @@
 
 def jobDescription = '''
 <p><img src="http://cassandra.apache.org/assets/img/logo-white.svg"; />
-<br/>Apache Cassandra DSL-generated job - DSL git repo: <a 
href="https://github.com/apache/cassandra-builds";>cassandra-builds</a></p>
+<br/>Full Apache Cassandra Test trends and history is found in <a 
href="https://butler.cassandra.apache.org/#/";>butler.cassandra.apache.org</a></p>
 <p>Logs and test results are archived in <a 
href="https://nightlies.apache.org/cassandra/";>nightlies.apache.org</a>
-<br/><i>protip: it is required to look in the pipeline's console log to find 
the stage build numbers for a specific pipeline run</i></p>
-<p>A basic mirror of all build summary pages (classic and blue ocean ui) is 
found here <a 
href="https://nightlies.apache.org/cassandra/ci-cassandra.apache.org/";>here</a></p>
+<br/><i>protip: use blue ocean ui to easier find the failed stage (and logs) 
build within a specific pipeline run</i></p>
                     '''
 
 // architectures. blank is amd64


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org