From 80ed499804c3042a0c7af71c53030461f4d1287e Mon Sep 17 00:00:00 2001
From: Bereng <berenguerblasi@gmail.com>
Date: Tue, 7 Sep 2021 07:47:31 +0200
Subject: [PATCH 1/3] Dtest cluster reusage

---
 build-scripts/cassandra-dtest-pytest.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build-scripts/cassandra-dtest-pytest.sh b/build-scripts/cassandra-dtest-pytest.sh
index 89eb59b3..e4e4e82f 100755
--- a/build-scripts/cassandra-dtest-pytest.sh
+++ b/build-scripts/cassandra-dtest-pytest.sh
@@ -86,8 +86,12 @@ fi
 
 SPLIT_TESTS=""
 if [ "x${DTEST_SPLIT_CHUNK}" != "x" ] ; then
-    ./run_dtests.py --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS} --dtest-print-tests-only --dtest-print-tests-output=${WORKSPACE}/test_list.txt 2>&1 > ${WORKSPACE}/test_stdout.txt
-    SPLIT_TESTS=$(split -n r/${DTEST_SPLIT_CHUNK} ${WORKSPACE}/test_list.txt)
+    ./run_dtests.py --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS} --dtest-print-tests-only --dtest-print-tests-output=${WORKSPACE}/reuseClusterTests.txt --pytest-options "-m reuse_cluster" 2>&1 > ${WORKSPACE}/test_stdout_reuse.txt
+    ./run_dtests.py --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS} --dtest-print-tests-only --dtest-print-tests-output=${WORKSPACE}/renewClusterTests.txt --pytest-options "-m \"not reuse_cluster\"" 2>&1 > ${WORKSPACE}/test_stdout_renew.txt
+    CHUNK=`echo ${DTEST_SPLIT_CHUNK}|cut -d "/" -f 1`
+    SPLITS=`echo ${DTEST_SPLIT_CHUNK}|cut -d "/" -f 2`
+    ./splitter.sh ${CHUNK} ${SPLITS} ${WORKSPACE}/reuseClusterTests.txt ${WORKSPACE}/renewClusterTests.txt ${WORKSPACE}/test_list.txt
+    SPLIT_TESTS=$(cat ${WORKSPACE}/test_list.txt)
 fi
 
 PYTEST_OPTS="-vv --log-cli-level=DEBUG --junit-xml=nosetests.xml --junit-prefix=${DTEST_TARGET} -s"

From 66be91f6356708f590a19308c64ce11dcb61fc4a Mon Sep 17 00:00:00 2001
From: Bereng <berenguerblasi@gmail.com>
Date: Wed, 15 Sep 2021 08:48:13 +0200
Subject: [PATCH 2/3] Jenkins friendly test collection

---
 build-scripts/cassandra-dtest-pytest.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-scripts/cassandra-dtest-pytest.sh b/build-scripts/cassandra-dtest-pytest.sh
index e4e4e82f..e3b9d819 100755
--- a/build-scripts/cassandra-dtest-pytest.sh
+++ b/build-scripts/cassandra-dtest-pytest.sh
@@ -87,7 +87,8 @@ fi
 SPLIT_TESTS=""
 if [ "x${DTEST_SPLIT_CHUNK}" != "x" ] ; then
     ./run_dtests.py --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS} --dtest-print-tests-only --dtest-print-tests-output=${WORKSPACE}/reuseClusterTests.txt --pytest-options "-m reuse_cluster" 2>&1 > ${WORKSPACE}/test_stdout_reuse.txt
-    ./run_dtests.py --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS} --dtest-print-tests-only --dtest-print-tests-output=${WORKSPACE}/renewClusterTests.txt --pytest-options "-m \"not reuse_cluster\"" 2>&1 > ${WORKSPACE}/test_stdout_renew.txt
+    ./run_dtests.py --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS} --dtest-print-tests-only --dtest-print-tests-output=${WORKSPACE}/allClusterTests.txt --pytest-options  2>&1 > ${WORKSPACE}/test_stdout_all.txt
+    grep -vf ${WORKSPACE}/reuseClusterTests.txt ${WORKSPACE}/allClusterTests.txt > ${WORKSPACE}/renewClusterTests.txt
     CHUNK=`echo ${DTEST_SPLIT_CHUNK}|cut -d "/" -f 1`
     SPLITS=`echo ${DTEST_SPLIT_CHUNK}|cut -d "/" -f 2`
     ./splitter.sh ${CHUNK} ${SPLITS} ${WORKSPACE}/reuseClusterTests.txt ${WORKSPACE}/renewClusterTests.txt ${WORKSPACE}/test_list.txt

From 86db69615e77c095d54105869fa1344b7735a863 Mon Sep 17 00:00:00 2001
From: Bereng <berenguerblasi@gmail.com>
Date: Wed, 15 Sep 2021 08:54:13 +0200
Subject: [PATCH 3/3] Bug

---
 build-scripts/cassandra-dtest-pytest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-scripts/cassandra-dtest-pytest.sh b/build-scripts/cassandra-dtest-pytest.sh
index e3b9d819..6c2ef9d5 100755
--- a/build-scripts/cassandra-dtest-pytest.sh
+++ b/build-scripts/cassandra-dtest-pytest.sh
@@ -87,7 +87,7 @@ fi
 SPLIT_TESTS=""
 if [ "x${DTEST_SPLIT_CHUNK}" != "x" ] ; then
     ./run_dtests.py --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS} --dtest-print-tests-only --dtest-print-tests-output=${WORKSPACE}/reuseClusterTests.txt --pytest-options "-m reuse_cluster" 2>&1 > ${WORKSPACE}/test_stdout_reuse.txt
-    ./run_dtests.py --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS} --dtest-print-tests-only --dtest-print-tests-output=${WORKSPACE}/allClusterTests.txt --pytest-options  2>&1 > ${WORKSPACE}/test_stdout_all.txt
+    ./run_dtests.py --cassandra-dir=$CASSANDRA_DIR ${DTEST_ARGS} --dtest-print-tests-only --dtest-print-tests-output=${WORKSPACE}/allClusterTests.txt 2>&1 > ${WORKSPACE}/test_stdout_all.txt
     grep -vf ${WORKSPACE}/reuseClusterTests.txt ${WORKSPACE}/allClusterTests.txt > ${WORKSPACE}/renewClusterTests.txt
     CHUNK=`echo ${DTEST_SPLIT_CHUNK}|cut -d "/" -f 1`
     SPLITS=`echo ${DTEST_SPLIT_CHUNK}|cut -d "/" -f 2`