You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2022/10/18 15:59:19 UTC

[cassandra] branch cassandra-4.0 updated (4157e7a8e0 -> cc622a20e1)

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

adelapena pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


    from 4157e7a8e0 Merge branch 'cassandra-3.11' into cassandra-4.0
     new 9aa28a81ec CircleCI: Automatically detect and repeat new or modified JUnit tests
     new f13cdddcad Merge branch 'cassandra-3.0' into cassandra-3.11
     new cc622a20e1 Merge branch 'cassandra-3.11' into cassandra-4.0

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .circleci/config-2_1.yml                |  905 +++--
 .circleci/config-2_1.yml.high_res.patch |   10 +-
 .circleci/config-2_1.yml.mid_res.patch  |   74 +-
 .circleci/config.yml                    | 4988 +++++++++++++++++--------
 .circleci/config.yml.HIGHRES            | 6087 +++++++++++++++++++++----------
 .circleci/config.yml.LOWRES             | 6081 ++++++++++++++++++++----------
 .circleci/config.yml.MIDRES             | 6083 ++++++++++++++++++++----------
 .circleci/generate.sh                   |  158 +-
 .circleci/readme.md                     |  109 +-
 9 files changed, 16812 insertions(+), 7683 deletions(-)


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


[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit cc622a20e1908d94626217b85737948b1df9b96a
Merge: 4157e7a8e0 f13cdddcad
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Tue Oct 18 16:51:29 2022 +0100

    Merge branch 'cassandra-3.11' into cassandra-4.0

 .circleci/config-2_1.yml                |  905 +++--
 .circleci/config-2_1.yml.high_res.patch |   10 +-
 .circleci/config-2_1.yml.mid_res.patch  |   74 +-
 .circleci/config.yml                    | 4988 +++++++++++++++++--------
 .circleci/config.yml.HIGHRES            | 6087 +++++++++++++++++++++----------
 .circleci/config.yml.LOWRES             | 6081 ++++++++++++++++++++----------
 .circleci/config.yml.MIDRES             | 6083 ++++++++++++++++++++----------
 .circleci/generate.sh                   |  158 +-
 .circleci/readme.md                     |  109 +-
 9 files changed, 16812 insertions(+), 7683 deletions(-)

diff --cc .circleci/config-2_1.yml
index 6a2aa5a50b,c3703d699d..591cfd71f6
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@@ -44,59 -43,85 +44,94 @@@ default_env_vars: &default_env_var
      CCM_MAX_HEAP_SIZE: 1024M
      CCM_HEAP_NEWSIZE: 256M
  
+     # Whether the repeated test iterations should stop on the first failure by default.
+     REPEATED_TESTS_STOP_ON_FAILURE: false
+ 
+     # Comma-separated list of tests that should be included in the repeated run for regular unit tests,
+     # in addition to automatically detected new and modified tests. For example:
+     # REPEATED_UTESTS: org.apache.cassandra.cql3.ViewTest
+     # REPEATED_UTESTS: org.apache.cassandra.cql3.ViewTest#testCountersTable
+     # REPEATED_UTESTS: org.apache.cassandra.cql3.ViewTest,org.apache.cassandra.cql3.functions.TimeFctsTest
+     REPEATED_UTESTS:
+     # The number of times that new, modified or manually specified unit tests should be run.
+     REPEATED_UTESTS_COUNT: 500
+ 
++    # Comma-separated list of tests that should be included in the repeated run for fqltool unit tests,
++    # in addition to automatically detected new and modified tests. For example:
++    # REPEATED_UTESTS_FQLTOOL: org.apache.cassandra.fqltool.FQLCompareTest
++    # REPEATED_UTESTS_FQLTOOL: org.apache.cassandra.fqltool.FQLCompareTest#endToEnd
++    # REPEATED_UTESTS_FQLTOOL: org.apache.cassandra.fqltool.FQLCompareTest,org.apache.cassandra.fqltool.FQLReplayTest
++    REPEATED_UTESTS_FQLTOOL:
++    # The number of times that new, modified or manually specified fqltool unit tests should be run.
++    REPEATED_UTESTS_FQLTOOL_COUNT: 500
++
+     # Comma-separated list of tests that should be included in the repeated run for long unit tests,
+     # in addition to automatically detected new and modified tests. For example:
+     # REPEATED_UTESTS_LONG: org.apache.cassandra.db.commitlog.CommitLogStressTest
+     # REPEATED_UTESTS_LONG: org.apache.cassandra.db.commitlog.CommitLogStressTest#testRandomSize
+     REPEATED_UTESTS_LONG:
+     # The number of times that new, modified or manually specified long unit tests should be run.
+     REPEATED_UTESTS_LONG_COUNT: 100
+ 
+     # Comma-separated list of tests that should be included in the repeated run for stress unit tests,
+     # in addition to automatically detected new and modified tests. For example:
+     # REPEATED_UTESTS_STRESS: org.apache.cassandra.stress.generate.DistributionGaussianTest
+     # REPEATED_UTESTS_STRESS: org.apache.cassandra.stress.generate.DistributionGaussianTest#simpleGaussian
+     REPEATED_UTESTS_STRESS:
+     # The number of times that new, modified or manually specified stress unit tests should be run.
+     REPEATED_UTESTS_STRESS_COUNT: 500
+ 
+     # Comma-separated list of tests that should be included in the repeated run for JVM dtests,
+     # in addition to automatically detected new and modified tests. For example:
+     # REPEATED_JVM_DTESTS: org.apache.cassandra.distributed.test.PagingTest
+     # REPEATED_JVM_DTESTS: org.apache.cassandra.distributed.test.PagingTest#testPaging
+     REPEATED_JVM_DTESTS:
+     # The number of times that new, modified or manually specified JVM dtests should be run.
+     REPEATED_JVM_DTESTS_COUNT: 500
+ 
+     # Comma-separated list of tests that should be included in the repeated run for JVM upgrade dtests,
+     # in addition to automatically detected new and modified tests. For example:
+     # REPEATED_JVM_UPGRADE_DTESTS: org.apache.cassandra.distributed.upgrade.GroupByTest
+     # REPEATED_JVM_UPGRADE_DTESTS: org.apache.cassandra.distributed.upgrade.GroupByTest#testReads
+     REPEATED_JVM_UPGRADE_DTESTS:
+     # The number of times that new, modified or manually specified JVM upgrade dtests should be run.
+     REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+ 
+     # Comma-separated list of Python dtests that should be repeatedly run, for example:
+     # REPEATED_DTESTS: cqlsh_tests/test_cqlsh.py
+     # REPEATED_DTESTS: cqlsh_tests/test_cqlsh.py::TestCqlshSmoke
+     # REPEATED_DTESTS: cqlsh_tests/test_cqlsh.py::TestCqlshSmoke::test_create_index
+     # REPEATED_DTESTS: cqlsh_tests/test_cqlsh.py,consistency_test.py
+     REPEATED_DTESTS:
+     # The number of times that the manually specified Python dtests should be run.
+     REPEATED_DTESTS_COUNT: 500
+ 
+     # Comma-separated list of Python dtests that should be repeatedly run, for example:
+     # REPEATED_UPGRADE_DTESTS: upgrade_tests/cql_tests.py
+     # REPEATED_UPGRADE_DTESTS: upgrade_tests/cql_tests.py::TestCQLNodes2RF1_Upgrade_current_4_0_x_To_indev_4_0_x
+     # REPEATED_UPGRADE_DTESTS: upgrade_tests/cql_tests.py,upgrade_tests/paging_test.py
+     REPEATED_UPGRADE_DTESTS:
+     # The number of times that the manually specified Python upgrade dtests should be run.
+     REPEATED_UPGRADE_DTESTS_COUNT: 25
+ 
      # The Ant test target to run, for example:
-     # REPEATED_UTEST_TARGET: testsome
-     # REPEATED_UTEST_TARGET: test-jvm-dtest-some
-     # REPEATED_UTEST_TARGET: test-cdc
-     # REPEATED_UTEST_TARGET: test-compression
-     # REPEATED_UTEST_TARGET: test-system-keyspace-directory
-     REPEATED_UTEST_TARGET: testsome
+     # REPEATED_ANT_TEST_TARGET: testsome
+     # REPEATED_ANT_TEST_TARGET: test-jvm-dtest-some
+     # REPEATED_ANT_TEST_TARGET: test-cdc
+     # REPEATED_ANT_TEST_TARGET: test-compression
+     # REPEATED_ANT_TEST_TARGET: test-system-keyspace-directory
+     REPEATED_ANT_TEST_TARGET: testsome
      # The name of JUnit class to be run multiple times, for example:
-     # REPEATED_UTEST_CLASS: org.apache.cassandra.cql3.ViewTest
-     # REPEATED_UTEST_CLASS: org.apache.cassandra.distributed.test.PagingTest
-     REPEATED_UTEST_CLASS:
-     # The optional specific methods within REPEATED_UTEST_CLASS to be run, for example:
-     # REPEATED_UTEST_METHODS: testCompoundPartitionKey
-     # REPEATED_UTEST_METHODS: testCompoundPartitionKey,testStaticTable
+     # REPEATED_ANT_TEST_CLASS: org.apache.cassandra.cql3.ViewTest
+     # REPEATED_ANT_TEST_CLASS: org.apache.cassandra.distributed.test.PagingTest
+     REPEATED_ANT_TEST_CLASS:
+     # The optional specific methods within REPEATED_ANT_TEST_CLASS to be run, for example:
+     # REPEATED_ANT_TEST_METHODS: testCompoundPartitionKey
+     # REPEATED_ANT_TEST_METHODS: testCompoundPartitionKey,testStaticTable
      # Please note that some Ant targets will ignore the -Dtest.methods argument produced by this.
-     REPEATED_UTEST_METHODS:
-     # The number of times that the repeated JUnit test should be run
-     REPEATED_UTEST_COUNT: 100
-     # Whether the test iteration should stop on the first failure
-     REPEATED_UTEST_STOP_ON_FAILURE: false
- 
-     # A Python dtest to be run multiple times, for example:
-     # REPEATED_DTEST_NAME: cqlsh_tests/test_cqlsh.py
-     # REPEATED_DTEST_NAME: cqlsh_tests/test_cqlsh.py::TestCqlshSmoke
-     # REPEATED_DTEST_NAME: cqlsh_tests/test_cqlsh.py::TestCqlshSmoke::test_create_index
-     REPEATED_DTEST_NAME:
-     # Whether the repeated Python dtest should use vnodes
-     REPEATED_DTEST_VNODES: false
-     # The number of times that the repeated Python dtest should be run
-     REPEATED_DTEST_COUNT: 100
-     # Whether the test iteration should stop on the first failure
-     REPEATED_DTEST_STOP_ON_FAILURE: false
- 
-     # A Python upgrade dtest to be run multiple times, for example:
-     # REPEATED_UPGRADE_DTEST_NAME: upgrade_tests/cql_tests.py
-     # REPEATED_UPGRADE_DTEST_NAME: upgrade_tests/cql_tests.py::TestCQLNodes2RF1_Upgrade_current_4_0_x_To_indev_4_0_x
-     REPEATED_UPGRADE_DTEST_NAME:
-     # The number of times that the repeated Python upgrade dtest should be run
-     REPEATED_UPGRADE_DTEST_COUNT: 100
-     # Whether the test iteration should stop on the first failure
-     REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
- 
-     # The name of JVM upgrade dtest class to be run multiple times, for example:
-     # REPEATED_JVM_UPGRADE_DTEST_CLASS: org.apache.cassandra.distributed.upgrade.MixedModeAvailabilityV30Test
-     REPEATED_JVM_UPGRADE_DTEST_CLASS:
-     # The optional specific methods within REPEATED_JVM_UPGRADE_DTEST_CLASS to be run, for example:
-     # REPEATED_JVM_UPGRADE_DTEST_METHODS: testAvailabilityV30ToV3X
-     # REPEATED_JVM_UPGRADE_DTEST_METHODS: testAvailabilityV30ToV3X,testAvailabilityV30ToV4
-     REPEATED_JVM_UPGRADE_DTEST_METHODS:
-     # The number of times that the repeated JVM upgrade dtest should be run
-     REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     # Whether the JVM upgrade dtest iteration should stop on the first failure
-     REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     REPEATED_ANT_TEST_METHODS:
+     # The number of times that the repeated JUnit test should be run.
+     REPEATED_ANT_TEST_COUNT: 500
  
  j8_par_executor: &j8_par_executor
    executor:
@@@ -166,87 -167,82 +201,135 @@@ j8_repeated_jvm_upgrade_dtest_executor
      name: java8-executor
    parallelism: 4
  
 -separate_jobs: &separate_jobs
 +j11_repeated_utest_executor: &j11_repeated_utest_executor
 +  executor:
 +    name: java11-executor
 +  parallelism: 4
 +
 +j11_repeated_dtest_executor: &j11_repeated_dtest_executor
 +  executor:
 +    name: java11-executor
 +  parallelism: 4
 +
- j8_with_dtests_jobs: &j8_with_dtests_jobs
++j8_separate_jobs: &j8_separate_jobs
    jobs:
 -    - start_build:
 +    - start_j8_build:
          type: approval
 -    - build:
 +    - j8_build:
          requires:
 -          - start_build
 +          - start_j8_build
      # Java 8 unit tests
      - start_j8_unit_tests:
          type: approval
      - j8_unit_tests:
          requires:
            - start_j8_unit_tests
 -          - build
 +          - j8_build
+     - start_j8_unit_tests_repeat:
+         type: approval
+     - j8_unit_tests_repeat:
+         requires:
+           - start_j8_unit_tests_repeat
 -          - build
++          - j8_build
      - start_j8_jvm_dtests:
          type: approval
      - j8_jvm_dtests:
          requires:
            - start_j8_jvm_dtests
 -          - build
 +          - j8_build
+     - start_j8_jvm_dtests_repeat:
+         type: approval
+     - j8_jvm_dtests_repeat:
+         requires:
+           - start_j8_jvm_dtests_repeat
 -          - build
 -    # specialized unit tests (all run using Java 8)
++          - j8_build
 +    - start_j8_cqlshlib_tests:
 +        type: approval
 +    - j8_cqlshlib_tests:
 +        requires:
 +          - start_j8_cqlshlib_tests
 +          - j8_build
 +    # Java 11 unit tests
 +    - start_j11_unit_tests:
 +        type: approval
 +    - j11_unit_tests:
 +        requires:
 +          - start_j11_unit_tests
 +          - j8_build
++    - start_j11_unit_tests_repeat:
++        type: approval
++    - j11_unit_tests_repeat:
++        requires:
++          - start_j11_unit_tests_repeat
++          - j8_build
 +    # specialized unit tests (all run on request using Java 8)
      - start_utests_long:
          type: approval
      - utests_long:
          requires:
            - start_utests_long
 -          - build
 +          - j8_build
+     - start_utests_long_repeat:
+         type: approval
+     - utests_long_repeat:
+         requires:
+           - start_utests_long_repeat
 -          - build
++          - j8_build
      - start_utests_compression:
          type: approval
      - utests_compression:
          requires:
            - start_utests_compression
 -          - build
 +          - j8_build
+     - start_utests_compression_repeat:
+         type: approval
+     - utests_compression_repeat:
+         requires:
+           - start_utests_compression_repeat
 -          - build
++          - j8_build
      - start_utests_stress:
          type: approval
      - utests_stress:
          requires:
            - start_utests_stress
 -          - build
 +          - j8_build
+     - start_utests_stress_repeat:
+         type: approval
+     - utests_stress_repeat:
+         requires:
+           - start_utests_stress_repeat
 -          - build
++          - j8_build
 +    - start_utests_fqltool:
 +        type: approval
 +    - utests_fqltool:
 +        requires:
 +          - start_utests_fqltool
 +          - j8_build
++    - start_utests_fqltool_repeat:
++        type: approval
++    - utests_fqltool_repeat:
++        requires:
++          - start_utests_fqltool_repeat
++          - j8_build
 +    - start_utests_system_keyspace_directory:
 +        type: approval
 +    - utests_system_keyspace_directory:
 +        requires:
 +          - start_utests_system_keyspace_directory
 +          - j8_build
++    - start_utests_system_keyspace_directory_repeat:
++        type: approval
++    - utests_system_keyspace_directory_repeat:
++        requires:
++          - start_utests_system_keyspace_directory_repeat
++          - j8_build
      - start_j8_dtest_jars_build:
          type: approval
      - j8_dtest_jars_build:
          requires:
 -          - build
 +          - j8_build
            - start_j8_dtest_jars_build
-     - start_jvm_upgrade_dtest:
+     - start_jvm_upgrade_dtests:
          type: approval
      - j8_jvm_upgrade_dtests:
          requires:
@@@ -255,130 -257,50 +344,136 @@@
      # Java 8 dtests
      - start_j8_dtests:
          type: approval
-     - j8_dtests-with-vnodes:
+     - j8_dtests:
          requires:
            - start_j8_dtests
 -          - build
 +          - j8_build
-     - j8_dtests-no-vnodes:
+     - start_j8_dtests_repeat:
+         type: approval
+     - j8_dtests_repeat:
          requires:
-           - start_j8_dtests
+           - start_j8_dtests_repeat
 -          - build
++          - j8_build
+     - start_j8_dtests_vnode:
+         type: approval
+     - j8_dtests_vnode:
+         requires:
+           - start_j8_dtests_vnode
 -          - build
++          - j8_build
+     - start_j8_dtests_vnode_repeat:
+         type: approval
+     - j8_dtests_vnode_repeat:
+         requires:
+           - start_j8_dtests_vnode_repeat
 -          - build
 +          - j8_build
 +    # Java 11 dtests
 +    - start_j11_dtests:
 +        type: approval
-     - j11_dtests-with-vnodes:
++    - j11_dtests:
 +        requires:
-         - start_j11_dtests
-         - j8_build
-     - j11_dtests-no-vnodes:
++          - start_j11_dtests
++          - j8_build
++    - start_j11_dtests_repeat:
++        type: approval
++    - j11_dtests_repeat:
 +        requires:
-         - start_j11_dtests
-         - j8_build
++          - start_j11_dtests_repeat
++          - j8_build
++    - start_j11_dtests_vnode:
++        type: approval
++    - j11_dtests_vnode:
++        requires:
++          - start_j11_dtests_vnode
++          - j8_build
++    - start_j11_dtests_vnode_repeat:
++        type: approval
++    - j11_dtests_vnode_repeat:
++        requires:
++          - start_j11_dtests_vnode_repeat
++          - j8_build
      # Java 8 upgrade tests
 -    - start_upgrade_dtests:
 +    - start_upgrade_tests:
          type: approval
-     - j8_upgradetests-no-vnodes:
+     - j8_upgrade_dtests:
          requires:
 -          - start_upgrade_dtests
 -          - build
 +          - start_upgrade_tests
 +          - j8_build
+     - start_j8_upgrade_dtests_repeat:
+         type: approval
+     - j8_upgrade_dtests_repeat:
+         requires:
+           - start_j8_upgrade_dtests_repeat
 -          - build
++          - j8_build
 +    # Java 8 cqlsh dtests
 +    - start_j8_cqlsh_tests:
 +        type: approval
 +    - j8_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +        - start_j8_cqlsh_tests
 +        - j8_build
-     - j8_cqlsh-dtests-py3-with-vnodes:
++    - j8_cqlsh_dtests_py3_vnode:
 +        requires:
 +        - start_j8_cqlsh_tests
 +        - j8_build
-     - j8_cqlsh-dtests-py38-with-vnodes:
++    - j8_cqlsh_dtests_py38_vnode:
 +        requires:
 +        - start_j8_cqlsh_tests
 +        - j8_build
 +    - j8_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +        - start_j8_cqlsh_tests
 +        - j8_build
-     - j8_cqlsh-dtests-py3-no-vnodes:
++    - j8_cqlsh_dtests_py3:
 +        requires:
 +        - start_j8_cqlsh_tests
 +        - j8_build
-     - j8_cqlsh-dtests-py38-no-vnodes:
++    - j8_cqlsh_dtests_py38:
 +        requires:
 +          - start_j8_cqlsh_tests
 +          - j8_build
 +    # Java 11 cqlsh dtests
 +    - start_j11_cqlsh_tests:
 +        type: approval
 +    - j11_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j8_build
-     - j11_cqlsh-dtests-py3-with-vnodes:
++    - j11_cqlsh_dtests_py3_vnode:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j8_build
-     - j11_cqlsh-dtests-py38-with-vnodes:
++    - j11_cqlsh_dtests_py38_vnode:
 +        requires:
 +          - start_j11_cqlsh_tests
 +          - j8_build
 +    - j11_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +          - start_j11_cqlsh_tests
 +          - j8_build
-     - j11_cqlsh-dtests-py3-no-vnodes:
++    - j11_cqlsh_dtests_py3:
 +        requires:
 +          - start_j11_cqlsh_tests
 +          - j8_build
-     - j11_cqlsh-dtests-py38-no-vnodes:
++    - j11_cqlsh_dtests_py38:
 +        requires:
 +          - start_j11_cqlsh_tests
 +          - j8_build
      # Java 8 repeated utest
-     - start_j8_repeated_utest:
+     - start_j8_repeated_ant_test:
          type: approval
-     - j8_repeated_utest:
+     - j8_repeated_ant_test:
          requires:
-           - start_j8_repeated_utest
+           - start_j8_repeated_ant_test
 -          - build
 +          - j8_build
 +    # Java 11 repeated utest
-     - start_j11_repeated_utest:
-         type: approval
-     - j11_repeated_utest:
-         requires:
-           - start_j11_repeated_utest
-           - j8_build
-     # Java 8 repeated dtest
-     - start_j8_repeated_dtest:
-         type: approval
-     - j8_repeated_dtest:
-         requires:
-           - start_j8_repeated_dtest
-           - j8_build
-     # Java 11 repeated dtest
-     - start_j11_repeated_dtest:
++    - start_j11_repeated_ant_test:
 +        type: approval
-     - j11_repeated_dtest:
++    - j11_repeated_ant_test:
 +        requires:
-           - start_j11_repeated_dtest
++          - start_j11_repeated_ant_test
 +          - j8_build
-     # Repeated Python upgrade dtest
-     - start_repeated_upgrade_dtest:
-         type: approval
-     - repeated_upgrade_dtest:
-         requires:
-             - start_repeated_upgrade_dtest
-             - j8_build
-     # Repeated JVM upgrade dtest
-     - start_repeated_jvm_upgrade_dtest:
-         type: approval
-     - repeated_jvm_upgrade_dtest:
-         requires:
-           - start_repeated_jvm_upgrade_dtest
-           - j8_dtest_jars_build
  
 -pre-commit_jobs: &pre-commit_jobs
 +j8_pre-commit_jobs: &j8_pre-commit_jobs
    jobs:
      - start_pre-commit_tests:
          type: approval
@@@ -388,304 -310,92 +483,323 @@@
      # Java 8 unit tests
      - j8_unit_tests:
          requires:
 -          - build
 +          - j8_build
+     - j8_unit_tests_repeat:
+         requires:
 -          - build
++          - j8_build
      - j8_jvm_dtests:
          requires:
 -          - build
 +          - j8_build
+     - j8_jvm_dtests_repeat:
+         requires:
 -          - build
++          - j8_build
 +    - j8_cqlshlib_tests:
 +        requires:
 +          - j8_build
 +    # Java 11 unit tests
 +    - j11_unit_tests:
 +        requires:
 +          - j8_build
++    - j11_unit_tests_repeat:
++        requires:
++          - j8_build
      # specialized unit tests (all run on request using Java 8)
      - start_utests_long:
          type: approval
      - utests_long:
          requires:
            - start_utests_long
 -          - build
 +          - j8_build
+     - utests_long_repeat:
+         requires:
+           - start_utests_long
 -          - build
++          - j8_build
      - start_utests_compression:
          type: approval
      - utests_compression:
          requires:
            - start_utests_compression
 -          - build
 +          - j8_build
+     - utests_compression_repeat:
+         requires:
+           - start_utests_compression
 -          - build
++          - j8_build
      - start_utests_stress:
          type: approval
      - utests_stress:
          requires:
            - start_utests_stress
 -          - build
 +          - j8_build
+     - utests_stress_repeat:
+         requires:
+           - start_utests_stress
 -          - build
++          - j8_build
 +    - start_utests_fqltool:
 +        type: approval
 +    - utests_fqltool:
 +        requires:
 +          - start_utests_fqltool
 +          - j8_build
++    - utests_fqltool_repeat:
++        requires:
++          - start_utests_fqltool
++          - j8_build
 +    - utests_system_keyspace_directory:
 +        requires:
 +          - j8_build
-     - start_j8_dtest_jars_build:
++    - utests_system_keyspace_directory_repeat:
++        requires:
++          - j8_build
+     - start_jvm_upgrade_dtests:
          type: approval
      - j8_dtest_jars_build:
          requires:
 -          - build
 +          - j8_build
-           - start_j8_dtest_jars_build
-     - start_jvm_upgrade_dtest:
-         type: approval
+           - start_jvm_upgrade_dtests
      - j8_jvm_upgrade_dtests:
          requires:
-           - start_jvm_upgrade_dtest
+           - j8_dtest_jars_build
+     - j8_jvm_upgrade_dtests_repeat:
+         requires:
            - j8_dtest_jars_build
      # Java 8 dtests
-     - j8_dtests-with-vnodes:
+     - j8_dtests:
+         requires:
 -          - build
++          - j8_build
+     - j8_dtests_repeat:
          requires:
 -          - build
 +          - j8_build
-     - j8_dtests-no-vnodes:
+     - j8_dtests_vnode:
+         requires:
 -          - build
++          - j8_build
+     - j8_dtests_vnode_repeat:
          requires:
 -          - build
 +          - j8_build
 +    # Java 11 dtests
-     - j11_dtests-with-vnodes:
++    - j11_dtests:
++        requires:
++          - j8_build
++    - j11_dtests_repeat:
++        requires:
++          - j8_build
++    - j11_dtests_vnode:
 +        requires:
 +          - j8_build
-     - j11_dtests-no-vnodes:
++    - j11_dtests_vnode_repeat:
 +        requires:
 +          - j8_build
      # Java 8 upgrade tests (on request)
      - start_upgrade_tests:
          type: approval
-     - j8_upgradetests-no-vnodes:
+     - j8_upgrade_dtests:
+         requires:
++          - j8_build
+           - start_upgrade_tests
 -          - build
+     - j8_upgrade_dtests_repeat:
          requires:
 +          - j8_build
            - start_upgrade_tests
 -          - build
 -    # Java 8 repeated utest
 -    - j8_repeated_ant_test:
 +    # Java 8 cqlsh dtests
 +    - j8_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +          - j8_build
-     - j8_cqlsh-dtests-py3-with-vnodes:
++    - j8_cqlsh_dtests_py3_vnode:
 +        requires:
 +          - j8_build
-     - j8_cqlsh-dtests-py38-with-vnodes:
++    - j8_cqlsh_dtests_py38_vnode:
 +        requires:
 +          - j8_build
 +    - j8_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +          - j8_build
-     - j8_cqlsh-dtests-py3-no-vnodes:
++    - j8_cqlsh_dtests_py3:
 +        requires:
 +          - j8_build
-     - j8_cqlsh-dtests-py38-no-vnodes:
++    - j8_cqlsh_dtests_py38:
 +        requires:
 +          - j8_build
 +    # Java 11 cqlsh dtests
 +    - j11_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +          - j8_build
-     - j11_cqlsh-dtests-py3-with-vnodes:
++    - j11_cqlsh_dtests_py3_vnode:
 +        requires:
 +          - j8_build
-     - j11_cqlsh-dtests-py38-with-vnodes:
++    - j11_cqlsh_dtests_py38_vnode:
 +        requires:
 +          - j8_build
 +    - j11_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +          - j8_build
-     - j11_cqlsh-dtests-py3-no-vnodes:
-         requires:
-           - j8_build
-     - j11_cqlsh-dtests-py38-no-vnodes:
-         requires:
-           - j8_build
-     # Java 8 repeated utest (on request)
-     - start_j8_repeated_utest:
-         type: approval
-     - j8_repeated_utest:
-         requires:
-           - start_j8_repeated_utest
-           - j8_build
-     # Java 11 repeated utest (on request)
-     - start_j11_repeated_utest:
-         type: approval
-     - j11_repeated_utest:
-         requires:
-           - start_j11_repeated_utest
-           - j8_build
-     # Java 8 repeated dtest (on request)
-     - start_j8_repeated_dtest:
-         type: approval
-     - j8_repeated_dtest:
-         requires:
-           - start_j8_repeated_dtest
-           - j8_build
-     # Java 11 repeated dtest (on request)
-     - start_j11_repeated_dtest:
-         type: approval
-     - j11_repeated_dtest:
++    - j11_cqlsh_dtests_py3:
          requires:
-           - start_j11_repeated_dtest
 -          - build
 +          - j8_build
-     # Repeated Python upgrade dtest (on request)
-     - start_repeated_upgrade_dtest:
-         type: approval
-     - repeated_upgrade_dtest:
++    - j11_cqlsh_dtests_py38:
 +        requires:
-           - start_repeated_upgrade_dtest
 +          - j8_build
-     # Repeated JVM upgrade dtest (on request)
-     - start_repeated_jvm_upgrade_dtest:
-         type: approval
-     - repeated_jvm_upgrade_dtest:
-         requires:
-           - start_repeated_jvm_upgrade_dtest
-           - j8_dtest_jars_build
 +
- j11_with_dtests_jobs: &j11_with_dtests_jobs
++j11_separate_jobs: &j11_separate_jobs
 +  jobs:
 +    - start_j11_build:
 +        type: approval
 +    - j11_build:
 +        requires:
 +          - start_j11_build
 +    # Java 11 unit tests
 +    - start_j11_unit_tests:
 +        type: approval
 +    - j11_unit_tests:
 +        requires:
 +          - start_j11_unit_tests
 +          - j11_build
++    - start_j11_unit_tests_repeat:
++        type: approval
++    - j11_unit_tests_repeat:
++        requires:
++          - start_j11_unit_tests_repeat
++          - j11_build
 +    - start_j11_jvm_dtests:
 +        type: approval
 +    - j11_jvm_dtests:
 +        requires:
 +          - start_j11_jvm_dtests
 +          - j11_build
++    - start_j11_jvm_dtests_repeat:
++        type: approval
++    - j11_jvm_dtests_repeat:
++        requires:
++          - start_j11_jvm_dtests_repeat
++          - j11_build
 +    - start_j11_cqlshlib_tests:
 +        type: approval
 +    - j11_cqlshlib_tests:
 +        requires:
 +          - start_j11_cqlshlib_tests
 +          - j11_build
 +    # Java 11 dtests
 +    - start_j11_dtests:
 +        type: approval
-     - j11_dtests-with-vnodes:
++    - j11_dtests:
 +        requires:
 +          - start_j11_dtests
 +          - j11_build
-     - j11_dtests-no-vnodes:
++    - start_j11_dtests_vnode:
++        type: approval
++    - j11_dtests_vnode:
 +        requires:
-           - start_j11_dtests
++          - start_j11_dtests_vnode
++          - j11_build
++    - start_j11_dtests_repeat:
++        type: approval
++    - j11_dtests_repeat:
++        requires:
++          - start_j11_dtests_repeat
++          - j11_build
++    - start_j11_dtests_vnode_repeat:
++        type: approval
++    - j11_dtests_vnode_repeat:
++        requires:
++          - start_j11_dtests_vnode_repeat
 +          - j11_build
 +    - start_j11_cqlsh_tests:
 +        type: approval
 +    - j11_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +          - start_j11_cqlsh_tests
 +          - j11_build
-     - j11_cqlsh-dtests-py3-with-vnodes:
++    - j11_cqlsh_dtests_py3_vnode:
 +        requires:
 +          - start_j11_cqlsh_tests
 +          - j11_build
-     - j11_cqlsh-dtests-py38-with-vnodes:
++    - j11_cqlsh_dtests_py38_vnode:
 +        requires:
 +          - start_j11_cqlsh_tests
 +          - j11_build
 +    - j11_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +          - start_j11_cqlsh_tests
 +          - j11_build
-     - j11_cqlsh-dtests-py3-no-vnodes:
++    - j11_cqlsh_dtests_py3:
 +        requires:
 +          - start_j11_cqlsh_tests
 +          - j11_build
-     - j11_cqlsh-dtests-py38-no-vnodes:
++    - j11_cqlsh_dtests_py38:
 +        requires:
 +          - start_j11_cqlsh_tests
 +          - j11_build
 +    # Java 11 repeated utest
-     - start_j11_repeated_utest:
++    - start_j11_repeated_ant_test:
 +        type: approval
-     - j11_repeated_utest:
++    - j11_repeated_ant_test:
 +        requires:
-           - start_j11_repeated_utest
-           - j11_build
-     # Java 11 repeated dtest
-     - start_j11_repeated_dtest:
-         type: approval
-     - j11_repeated_dtest:
-         requires:
-           - start_j11_repeated_dtest
++          - start_j11_repeated_ant_test
 +          - j11_build
 +
 +j11_pre-commit_jobs: &j11_pre-commit_jobs
 +  jobs:
 +    - start_pre-commit_tests:
 +        type: approval
 +    - j11_build:
 +        requires:
 +          - start_pre-commit_tests
 +    - j11_unit_tests:
 +        requires:
 +          - j11_build
++    - j11_unit_tests_repeat:
++        requires:
++          - j11_build
 +    - j11_jvm_dtests:
 +        requires:
 +          - j11_build
++    - j11_jvm_dtests_repeat:
++        requires:
++          - j11_build
 +    - j11_cqlshlib_tests:
 +        requires:
 +          - j11_build
 +    - j11_jvm_dtests:
 +        requires:
 +          - j11_build
 +    - j11_cqlshlib_tests:
 +        requires:
 +          - j11_build
-     - j11_dtests-with-vnodes:
++    - j11_dtests:
 +        requires:
 +          - j11_build
-     - j11_dtests-no-vnodes:
++    - j11_dtests_repeat:
 +        requires:
 +          - j11_build
-     - j11_cqlsh-dtests-py2-with-vnodes:
++    - j11_dtests_vnode:
 +        requires:
 +          - j11_build
-     - j11_cqlsh-dtests-py3-with-vnodes:
++    - j11_dtests_vnode_repeat:
 +        requires:
 +          - j11_build
-     - j11_cqlsh-dtests-py38-with-vnodes:
++    - j11_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +          - j11_build
-     - j11_cqlsh-dtests-py2-no-vnodes:
++    - j11_cqlsh_dtests_py3_vnode:
 +        requires:
 +          - j11_build
-     - j11_cqlsh-dtests-py3-no-vnodes:
++    - j11_cqlsh_dtests_py38_vnode:
 +        requires:
 +          - j11_build
-     - j11_cqlsh-dtests-py38-no-vnodes:
++    - j11_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +          - j11_build
-     # Java 11 repeated utest (on request)
-     - start_j11_repeated_utest:
-         type: approval
-     - j11_repeated_utest:
++    - j11_cqlsh_dtests_py3:
 +        requires:
-           - start_j11_repeated_utest
 +          - j11_build
-     # Java 11 repeated dtest (on request)
-     - start_j11_repeated_dtest:
-         type: approval
-     - j11_repeated_dtest:
++    - j11_cqlsh_dtests_py38:
 +        requires:
-           - start_j11_repeated_dtest
 +          - j11_build
  
  workflows:
      version: 2
-     java8_separate_tests: *j8_with_dtests_jobs
 -    separate_tests: *separate_jobs
 -    pre-commit_tests: *pre-commit_jobs
++    java8_separate_tests: *j8_separate_jobs
 +    java8_pre-commit_tests: *j8_pre-commit_jobs
-     java11_separate_tests: *j11_with_dtests_jobs
++    java11_separate_tests: *j11_separate_jobs
 +    java11_pre-commit_tests: *j11_pre-commit_jobs
  
  executors:
    java8-executor:
@@@ -850,25 -499,7 +964,25 @@@ jobs
        - run_junit_tests:
            target: stress-test
  
 +  utests_fqltool:
 +    <<: *j8_seq_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - run_junit_tests:
 +          target: fqltool-test
 +
 +  utests_system_keyspace_directory:
 +    <<: *j8_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - create_junit_containers
 +      - log_environment
 +      - run_parallel_junit_tests:
 +          target: testclasslist-system-keyspace-directory
 +
-   j8_dtests-with-vnodes:
+   j8_dtests_vnode:
      <<: *j8_par_executor
      steps:
        - attach_workspace:
@@@ -877,27 -508,12 +991,27 @@@
        - create_venv
        - create_dtest_containers:
            file_tag: j8_with_vnodes
 -          run_dtests_extra_args: '--use-vnodes --skip-resource-intensive-tests'
 +          run_dtests_extra_args: "--use-vnodes --skip-resource-intensive-tests --pytest-options '-k not cql'"
        - run_dtests:
            file_tag: j8_with_vnodes
 -          pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
 +          pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 +
-   j11_dtests-with-vnodes:
++  j11_dtests_vnode:
 +    <<: *j11_par_executor
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - log_environment
 +    - clone_dtest
 +    - create_venv
 +    - create_dtest_containers:
 +        file_tag: j11_with_vnodes
 +        run_dtests_extra_args: "--use-vnodes --skip-resource-intensive-tests --pytest-options '-k not cql'"
 +    - run_dtests:
 +        file_tag: j11_with_vnodes
 +        pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
  
-   j8_dtests-no-vnodes:
+   j8_dtests:
      <<: *j8_par_executor
      steps:
        - attach_workspace:
@@@ -911,22 -527,7 +1025,22 @@@
            file_tag: j8_without_vnodes
            pytest_extra_args: '--skip-resource-intensive-tests'
  
-   j11_dtests-no-vnodes:
++  j11_dtests:
 +    <<: *j11_par_executor
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - log_environment
 +    - clone_dtest
 +    - create_venv
 +    - create_dtest_containers:
 +        file_tag: j11_without_vnodes
 +        run_dtests_extra_args: "--skip-resource-intensive-tests --pytest-options '-k not cql'"
 +    - run_dtests:
 +        file_tag: j11_without_vnodes
 +        pytest_extra_args: '--skip-resource-intensive-tests'
 +
-   j8_upgradetests-no-vnodes:
+   j8_upgrade_dtests:
      <<: *j8_par_executor
      steps:
        - attach_workspace:
@@@ -935,230 -536,98 +1049,324 @@@
        - create_venv
        - create_dtest_containers:
            file_tag: j8_upgradetests_without_vnodes
 -          run_dtests_extra_args: '--execute-upgrade-tests'
 -          extra_env_args: 'RUN_STATIC_UPGRADE_MATRIX=true'
 -          tests_filter_pattern: '^upgrade_tests'
 +          run_dtests_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
        - run_dtests:
            file_tag: j8_upgradetests_without_vnodes
 -          extra_env_args: 'RUN_STATIC_UPGRADE_MATRIX=true'
 -          pytest_extra_args: '--execute-upgrade-tests'
 +          pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
 +
 +  j8_cqlsh-dtests-py2-with-vnodes:
 +    <<: *j8_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv
 +      - create_dtest_containers:
 +          file_tag: j8_with_vnodes
 +          run_dtests_extra_args: "--use-vnodes --skip-resource-intensive-tests --pytest-options '-k cql'"
 +      - run_dtests:
 +          file_tag: j8_with_vnodes
 +          pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
 +
-   j8_cqlsh-dtests-py3-with-vnodes:
++  j8_cqlsh_dtests_py3_vnode:
 +    <<: *j8_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv
 +      - create_dtest_containers:
 +          file_tag: j8_with_vnodes
 +          run_dtests_extra_args: "--use-vnodes --skip-resource-intensive-tests --pytest-options '-k cql'"
 +      - run_dtests:
 +          file_tag: j8_with_vnodes
 +          pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 +
-   j8_cqlsh-dtests-py38-with-vnodes:
++  j8_cqlsh_dtests_py38_vnode:
 +    <<: *j8_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv:
 +          python_version: '3.8'
 +      - create_dtest_containers:
 +          file_tag: j8_with_vnodes
 +          run_dtests_extra_args: "--use-vnodes --skip-resource-intensive-tests --pytest-options '-k cql'"
 +          python_version: '3.8'
 +      - run_dtests:
 +          file_tag: j8_with_vnodes
 +          pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
 +          python_version: '3.8'
 +
 +  j8_cqlsh-dtests-py2-no-vnodes:
 +    <<: *j8_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv
 +      - create_dtest_containers:
 +          file_tag: j8_without_vnodes
 +          run_dtests_extra_args: "--skip-resource-intensive-tests --pytest-options '-k cql'"
 +      - run_dtests:
 +          file_tag: j8_without_vnodes
 +          pytest_extra_args: '--skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
 +
-   j8_cqlsh-dtests-py3-no-vnodes:
++  j8_cqlsh_dtests_py3:
 +    <<: *j8_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv
 +      - create_dtest_containers:
 +          file_tag: j8_without_vnodes
 +          run_dtests_extra_args: "--skip-resource-intensive-tests --pytest-options '-k cql'"
 +      - run_dtests:
 +          file_tag: j8_without_vnodes
 +          pytest_extra_args: '--skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 +
-   j8_cqlsh-dtests-py38-no-vnodes:
++  j8_cqlsh_dtests_py38:
 +    <<: *j8_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv:
 +          python_version: '3.8'
 +      - create_dtest_containers:
 +          file_tag: j8_without_vnodes
 +          run_dtests_extra_args: "--skip-resource-intensive-tests --pytest-options '-k cql'"
 +          python_version: '3.8'
 +      - run_dtests:
 +          file_tag: j8_without_vnodes
 +          pytest_extra_args: '--skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
 +          python_version: '3.8'
 +
 +  j11_cqlsh-dtests-py2-with-vnodes:
 +    <<: *j11_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv
 +      - create_dtest_containers:
 +          file_tag: j11_with_vnodes
 +          run_dtests_extra_args: "--use-vnodes --skip-resource-intensive-tests --pytest-options '-k cql'"
 +      - run_dtests:
 +          file_tag: j11_with_vnodes
 +          pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
 +
-   j11_cqlsh-dtests-py3-with-vnodes:
++  j11_cqlsh_dtests_py3_vnode:
 +    <<: *j11_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv
 +      - create_dtest_containers:
 +          file_tag: j11_with_vnodes
 +          run_dtests_extra_args: "--use-vnodes --skip-resource-intensive-tests --pytest-options '-k cql'"
 +      - run_dtests:
 +          file_tag: j11_with_vnodes
 +          pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 +
-   j11_cqlsh-dtests-py38-with-vnodes:
++  j11_cqlsh_dtests_py38_vnode:
 +    <<: *j11_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv:
 +          python_version: '3.8'
 +      - create_dtest_containers:
 +          file_tag: j11_with_vnodes
 +          run_dtests_extra_args: "--use-vnodes --skip-resource-intensive-tests --pytest-options '-k cql'"
 +          python_version: '3.8'
 +      - run_dtests:
 +          file_tag: j11_with_vnodes
 +          pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
 +          python_version: '3.8'
 +
 +  j11_cqlsh-dtests-py2-no-vnodes:
 +    <<: *j11_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv
 +      - create_dtest_containers:
 +          file_tag: j11_without_vnodes
 +          run_dtests_extra_args: "--skip-resource-intensive-tests --pytest-options '-k cql'"
 +      - run_dtests:
 +          file_tag: j11_without_vnodes
 +          pytest_extra_args: '--skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
 +
-   j11_cqlsh-dtests-py3-no-vnodes:
++  j11_cqlsh_dtests_py3:
 +    <<: *j11_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv
 +      - create_dtest_containers:
 +          file_tag: j11_without_vnodes
 +          run_dtests_extra_args: "--skip-resource-intensive-tests --pytest-options '-k cql'"
 +      - run_dtests:
 +          file_tag: j11_without_vnodes
 +          pytest_extra_args: '--skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 +
-   j11_cqlsh-dtests-py38-no-vnodes:
++  j11_cqlsh_dtests_py38:
 +    <<: *j11_par_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - clone_dtest
 +      - create_venv:
 +          python_version: '3.8'
 +      - create_dtest_containers:
 +          file_tag: j11_without_vnodes
 +          run_dtests_extra_args: "--skip-resource-intensive-tests --pytest-options '-k cql'"
 +          python_version: '3.8'
 +      - run_dtests:
 +          file_tag: j11_without_vnodes
 +          pytest_extra_args: '--skip-resource-intensive-tests'
 +          extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
 +          python_version: '3.8'
  
-   j8_repeated_utest:
+   j8_unit_tests_repeat:
+     <<: *j8_repeated_utest_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+       - log_environment
+       - run_unit_tests_repeat
+ 
+   utests_compression_repeat:
+     <<: *j8_repeated_utest_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+       - log_environment
+       - run_utests_compression_repeat
+ 
+   utests_system_keyspace_directory_repeat:
+     <<: *j8_repeated_utest_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+       - log_environment
+       - run_utests_system_keyspace_directory_repeat
+ 
++  utests_fqltool_repeat:
++    <<: *j8_repeated_utest_executor
++    steps:
++      - attach_workspace:
++          at: /home/cassandra
++      - log_environment
++      - run_utests_fqltool_repeat
++
+   utests_long_repeat:
+     <<: *j8_repeated_utest_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+       - log_environment
+       - run_utests_long_repeat
+ 
+   utests_stress_repeat:
+     <<: *j8_repeated_utest_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+       - log_environment
+       - run_utests_stress_repeat
+ 
++  j11_unit_tests_repeat:
++    <<: *j11_repeated_utest_executor
++    steps:
++      - attach_workspace:
++          at: /home/cassandra
++      - log_environment
++      - run_unit_tests_repeat
++
+   j8_jvm_dtests_repeat:
+     <<: *j8_repeated_utest_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+       - log_environment
+       - run_jvm_dtests_repeat
+ 
+   j8_jvm_upgrade_dtests_repeat:
+     <<: *j8_repeated_jvm_upgrade_dtest_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+       - log_environment
+       - run_jvm_upgrade_dtests_repeat
+ 
++  j11_jvm_dtests_repeat:
++    <<: *j11_repeated_utest_executor
++    steps:
++      - attach_workspace:
++          at: /home/cassandra
++      - log_environment
++      - run_jvm_dtests_repeat
++
+   j8_repeated_ant_test:
      <<: *j8_repeated_utest_executor
      steps:
        - attach_workspace:
            at: /home/cassandra
        - log_environment
        - run_repeated_utest:
-           target: ${REPEATED_UTEST_TARGET}
-           class: ${REPEATED_UTEST_CLASS}
-           methods: ${REPEATED_UTEST_METHODS}
-           count: ${REPEATED_UTEST_COUNT}
-           stop_on_failure: ${REPEATED_UTEST_STOP_ON_FAILURE}
+           target: ${REPEATED_ANT_TEST_TARGET}
+           class: ${REPEATED_ANT_TEST_CLASS}
+           methods: ${REPEATED_ANT_TEST_METHODS}
+           count: ${REPEATED_ANT_TEST_COUNT}
+           stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
  
-   j11_repeated_utest:
++  j11_repeated_ant_test:
 +    <<: *j11_repeated_utest_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - log_environment
 +      - run_repeated_utest:
-           target: ${REPEATED_UTEST_TARGET}
-           class: ${REPEATED_UTEST_CLASS}
-           methods: ${REPEATED_UTEST_METHODS}
-           count: ${REPEATED_UTEST_COUNT}
-           stop_on_failure: ${REPEATED_UTEST_STOP_ON_FAILURE}
++          target: ${REPEATED_ANT_TEST_TARGET}
++          class: ${REPEATED_ANT_TEST_CLASS}
++          methods: ${REPEATED_ANT_TEST_METHODS}
++          count: ${REPEATED_ANT_TEST_COUNT}
++          stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
++
+   j8_dtests_repeat:
+     <<: *j8_repeated_dtest_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+       - clone_dtest
+       - create_venv
+       - run_repeated_dtest:
+           tests: ${REPEATED_DTESTS}
+           vnodes: "false"
+           upgrade: "false"
+           count: ${REPEATED_DTESTS_COUNT}
+           stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
  
-   j8_repeated_dtest:
+   j8_dtests_vnode_repeat:
      <<: *j8_repeated_dtest_executor
      steps:
        - attach_workspace:
@@@ -1166,41 -635,13 +1374,43 @@@
        - clone_dtest
        - create_venv
        - run_repeated_dtest:
-           tests: ${REPEATED_DTEST_NAME}
-           vnodes: ${REPEATED_DTEST_VNODES}
+           tests: ${REPEATED_DTESTS}
+           vnodes: "true"
            upgrade: "false"
-           count: ${REPEATED_DTEST_COUNT}
-           stop_on_failure: ${REPEATED_DTEST_STOP_ON_FAILURE}
+           count: ${REPEATED_DTESTS_COUNT}
+           stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
  
-   j11_repeated_dtest:
++  j11_dtests_repeat:
 +    <<: *j11_repeated_dtest_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - log_environment
 +      - clone_dtest
 +      - create_venv
 +      - run_repeated_dtest:
-           tests: ${REPEATED_DTEST_NAME}
-           vnodes: ${REPEATED_DTEST_VNODES}
++          tests: ${REPEATED_DTESTS}
++          vnodes: "false"
 +          upgrade: "false"
-           count: ${REPEATED_DTEST_COUNT}
-           stop_on_failure: ${REPEATED_DTEST_STOP_ON_FAILURE}
++          count: ${REPEATED_DTESTS_COUNT}
++          stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
 +
-   repeated_jvm_upgrade_dtest:
-     <<: *j8_repeated_jvm_upgrade_dtest_executor
++  j11_dtests_vnode_repeat:
++    <<: *j11_repeated_dtest_executor
 +    steps:
 +      - attach_workspace:
 +          at: /home/cassandra
 +      - log_environment
-       - run_repeated_utest:
-           target: test-jvm-dtest-some
-           class: ${REPEATED_JVM_UPGRADE_DTEST_CLASS}
-           methods: ${REPEATED_JVM_UPGRADE_DTEST_METHODS}
-           count: ${REPEATED_JVM_UPGRADE_DTEST_COUNT}
-           stop_on_failure: ${REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE}
++      - clone_dtest
++      - create_venv
++      - run_repeated_dtest:
++          tests: ${REPEATED_DTESTS}
++          vnodes: "true"
++          upgrade: "false"
++          count: ${REPEATED_DTESTS_COUNT}
++          stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
 +
-   repeated_upgrade_dtest:
+   j8_upgrade_dtests_repeat:
      <<: *j8_repeated_upgrade_dtest_executor
      steps:
        - attach_workspace:
@@@ -1559,6 -976,181 +1769,190 @@@ commands
            path: ~/cassandra-dtest/logs
            destination: dtest_<<parameters.file_tag>>_logs
  
+   run_unit_tests_repeat:
+     steps:
+       - run_repeated_utests:
+           target: testsome
+           tests: ${REPEATED_UTESTS}
+           count: ${REPEATED_UTESTS_COUNT}
+           stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
+ 
+   run_utests_compression_repeat:
+     steps:
+       - run_repeated_utests:
+           target: test-compression
+           tests: ${REPEATED_UTESTS}
+           count: ${REPEATED_UTESTS_COUNT}
+           stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
+ 
+   run_utests_system_keyspace_directory_repeat:
+     steps:
+       - run_repeated_utests:
+           target: test-system-keyspace-directory
+           tests: ${REPEATED_UTESTS}
+           count: ${REPEATED_UTESTS_COUNT}
+           stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
+ 
+   run_utests_long_repeat:
+     steps:
+       - run_repeated_utests:
+           target: long-testsome
+           tests: ${REPEATED_UTESTS_LONG}
+           count: ${REPEATED_UTESTS_LONG_COUNT}
+           stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
+ 
++  run_utests_fqltool_repeat:
++    steps:
++      - run_repeated_utests:
++          target: fqltool-test
++          tests: ${REPEATED_UTESTS_FQLTOOL}
++          count: ${REPEATED_UTESTS_FQLTOOL_COUNT}
++          stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
++
+   run_utests_stress_repeat:
+     steps:
+       - run_repeated_utests:
+           target: stress-test-some
+           tests: ${REPEATED_UTESTS_STRESS}
+           count: ${REPEATED_UTESTS_STRESS_COUNT}
+           stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
+ 
+   run_jvm_dtests_repeat:
+     steps:
+       - run_repeated_utests:
+           target: test-jvm-dtest-some
+           tests: ${REPEATED_JVM_DTESTS}
+           count: ${REPEATED_JVM_DTESTS_COUNT}
+           stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
+ 
+   run_jvm_upgrade_dtests_repeat:
+     steps:
+       - run_repeated_utests:
+           target: test-jvm-dtest-some
+           tests: ${REPEATED_JVM_UPGRADE_DTESTS}
+           count: ${REPEATED_JVM_UPGRADE_DTESTS_COUNT}
+           stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
+ 
+   run_repeated_utests:
+     parameters:
+       target:
+         type: string
+       tests:
+         type: string
+       count:
+         type: string
+       stop_on_failure:
+         type: string
+     steps:
+       - run:
+           name: Repeatedly run new or modifed JUnit tests
+           no_output_timeout: 15m
+           command: |
+             set -x
+             export PATH=$JAVA_HOME/bin:$PATH
+             time mv ~/cassandra /tmp
+             cd /tmp/cassandra
+             if [ -d ~/dtest_jars ]; then
+               cp ~/dtest_jars/dtest* /tmp/cassandra/build/
+             fi
 -
++            
+             # Calculate the number of test iterations to be run by the current parallel runner.
+             count=$((<<parameters.count>> / CIRCLE_NODE_TOTAL))
+             if (($CIRCLE_NODE_INDEX < (<<parameters.count>> % CIRCLE_NODE_TOTAL))); then
+               count=$((count+1))
+             fi
 -
++            
+             # Put manually specified tests and automatically detected tests together, removing duplicates
+             tests=$(echo <<parameters.tests>> | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
+             echo "Tests to be repeated: ${tests}"
 -
++            
+             # Run each test class as many times as requested.
+             exit_code="$?"
+             for test in $tests; do
 -
++            
+                 # Split class and method names from the test name
+                 if [[ $test =~ "#" ]]; then
+                   class=${test%"#"*}
+                   method=${test#*"#"}
+                 else
+                   class=$test
+                   method=""
+                 fi
 -
++            
+                 # Prepare the -Dtest.name argument.
+                 # It can be the fully qualified class name or the short class name, depending on the target.
+                 if [[ $target == "test" || \
+                       $target == "test-cdc" || \
+                       $target == "test-compression" || \
+                       $target == "test-system-keyspace-directory" || \
++                      $target == "fqltool-test" || \
+                       $target == "long-test" || \
+                       $target == "stress-test" ]]; then
+                   name_arg="-Dtest.name=${class##*.}"
+                 else
+                   name_arg="-Dtest.name=$class"
+                 fi
 -
++            
+                 # Prepare the -Dtest.methods argument, which is optional
+                 if [ $method == "" ]; then
+                   methods_arg=""
+                 else
+                   methods_arg="-Dtest.methods=$method"
+                 fi
 -
++            
+                 for i in $(seq -w 1 $count); do
+                   echo "Running test $test, iteration $i of $count"
+ 
+                   # run the test
+                   status="passes"
+                   if !( set -o pipefail && \
+                         ant <<parameters.target>> $name_arg $methods_arg -Dno-build-test=true | \
+                         tee stdout.txt \
+                       ); then
+                     status="fails"
+                     exit_code=1
+                   fi
+ 
+                   # move the stdout output file
+                   dest=/tmp/results/repeated_utests/stdout/${status}/${i}
+                   mkdir -p $dest
+                   mv stdout.txt $dest/${test}.txt
+ 
+                   # move the XML output files
+                   source=build/test/output
+                   dest=/tmp/results/repeated_utests/output/${status}/${i}
+                   mkdir -p $dest
+                   if [[ -d $source && -n "$(ls $source)" ]]; then
+                     mv $source/* $dest/
+                   fi
+ 
+                   # move the log files
+                   source=build/test/logs
+                   dest=/tmp/results/repeated_utests/logs/${status}/${i}
+                   mkdir -p $dest
+                   if [[ -d $source && -n "$(ls $source)" ]]; then
+                     mv $source/* $dest/
+                   fi
 -
++            
+                   # maybe stop iterations on test failure
+                   if [[ <<parameters.stop_on_failure>> = true ]] && (( $exit_code > 0 )); then
+                     break
+                   fi
+                 done
+             done
+             (exit ${exit_code})
+       - store_test_results:
+           path: /tmp/results/repeated_utests/output
+       - store_artifacts:
+           path: /tmp/results/repeated_utests/stdout
+           destination: stdout
+       - store_artifacts:
+           path: /tmp/results/repeated_utests/output
+           destination: junitxml
+       - store_artifacts:
+           path: /tmp/results/repeated_utests/logs
+           destination: logs
+ 
    run_repeated_utest:
      parameters:
        target:
@@@ -1613,7 -1205,9 +2007,10 @@@
                  if [[ $target == "test" || \
                        $target == "test-cdc" || \
                        $target == "test-compression" || \
-                       $target == "test-system-keyspace-directory" ]]; then
+                       $target == "test-system-keyspace-directory" || \
++                      $target == "fqltool-test" || \
+                       $target == "long-test" || \
+                       $target == "stress-test" ]]; then
                    name="-Dtest.name=$class_name"
                  else
                    name="-Dtest.name=$class_path"
@@@ -1729,6 -1323,8 +2126,8 @@@
                  echo "env: $(env)"
                  echo "** done env"
                  mkdir -p /tmp/results/dtests
 -
++            
+                 tests_arg=$(echo <<parameters.tests>> | sed -e "s/,/ /g")
  
                  stop_on_failure_arg=""
                  if <<parameters.stop_on_failure>>; then
diff --cc .circleci/config-2_1.yml.high_res.patch
index 3e92def52e,d2996086de..039203ddd2
--- a/.circleci/config-2_1.yml.high_res.patch
+++ b/.circleci/config-2_1.yml.high_res.patch
@@@ -1,6 -1,17 +1,6 @@@
- --- config-2_1.yml	2022-05-30 12:01:09.000000000 -0400
- +++ config-2_1.yml.HIGHRES	2022-05-30 12:03:00.000000000 -0400
- @@ -101,14 +101,14 @@
 ---- config-2_1.yml	2022-10-15 14:49:08.115591764 +0100
 -+++ config-2_1.yml.HIGHRES	2022-10-15 14:50:05.887981105 +0100
 -@@ -40,8 +40,8 @@
 -     CASSANDRA_SKIP_SYNC: true
 -     DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 -     DTEST_BRANCH: trunk
 --    CCM_MAX_HEAP_SIZE: 1024M
 --    CCM_HEAP_NEWSIZE: 256M
 -+    CCM_MAX_HEAP_SIZE: 2048M
 -+    CCM_HEAP_NEWSIZE: 512M
 - 
 -     # Whether the repeated test iterations should stop on the first failure by default.
 -     REPEATED_TESTS_STOP_ON_FAILURE: false
 -@@ -126,46 +126,50 @@
++--- config-2_1.yml	2022-10-15 13:31:58.877152008 +0100
+++++ config-2_1.yml.HIGHRES	2022-10-15 13:32:14.947560988 +0100
++@@ -136,14 +136,14 @@
   j8_par_executor: &j8_par_executor
     executor:
       name: java8-executor
@@@ -15,11 -26,8 +15,11 @@@
  -    #exec_resource_class: xlarge
  -  parallelism: 1
  +    exec_resource_class: xlarge
 -+  parallelism: 2
 ++  parallelism: 5
   
 + j8_small_executor: &j8_small_executor
 +   executor:
- @@ -119,62 +119,68 @@
++@@ -154,62 +154,68 @@
   j8_medium_par_executor: &j8_medium_par_executor
     executor:
       name: java8-executor
@@@ -88,19 -71,5 +88,19 @@@
  +    exec_resource_class: xlarge
  +  parallelism: 100
   
 - separate_jobs: &separate_jobs
 + j11_repeated_utest_executor: &j11_repeated_utest_executor
 +   executor:
 +     name: java11-executor
 +-  parallelism: 4
 ++    exec_resource_class: xlarge
 ++  parallelism: 100
 + 
 + j11_repeated_dtest_executor: &j11_repeated_dtest_executor
 +   executor:
 +     name: java11-executor
 +-  parallelism: 4
 ++    exec_resource_class: xlarge
 ++  parallelism: 100
 + 
-  j8_with_dtests_jobs: &j8_with_dtests_jobs
++ j8_separate_jobs: &j8_separate_jobs
     jobs:
diff --cc .circleci/config-2_1.yml.mid_res.patch
index 43a684651a,8eb567d5e4..52e74e2ecb
--- a/.circleci/config-2_1.yml.mid_res.patch
+++ b/.circleci/config-2_1.yml.mid_res.patch
@@@ -1,10 -1,9 +1,10 @@@
- --- config-2_1.yml	2022-05-30 12:01:09.000000000 -0400
- +++ config-2_1.yml.MIDRES	2022-05-30 12:02:51.000000000 -0400
- @@ -101,14 +101,14 @@
 ---- config-2_1.yml	2022-10-15 14:49:08.115591764 +0100
 -+++ config-2_1.yml.MIDRES	2022-10-15 14:50:05.881594331 +0100
 -@@ -127,45 +127,65 @@
++--- config-2_1.yml	2022-10-15 13:31:58.877152008 +0100
+++++ config-2_1.yml.MIDRES	2022-10-15 13:32:14.940950632 +0100
++@@ -136,14 +136,14 @@
 + j8_par_executor: &j8_par_executor
     executor:
       name: java8-executor
 -     #exec_resource_class: xlarge
 +-    #exec_resource_class: xlarge
  -  parallelism: 4
  +    exec_resource_class: medium
  +  parallelism: 25
@@@ -17,9 -16,6 +17,9 @@@
  +    exec_resource_class: large
  +  parallelism: 10
   
 + j8_small_executor: &j8_small_executor
 +   executor:
- @@ -119,26 +119,38 @@
++@@ -154,26 +154,38 @@
   j8_medium_par_executor: &j8_medium_par_executor
     executor:
       name: java8-executor
@@@ -47,34 -43,6 +47,34 @@@
  +    exec_resource_class: medium
     parallelism: 1 # sequential, single container tests: no parallelism benefits
   
 + j11_par_executor: &j11_par_executor
 +   executor:
 +     name: java11-executor
 +-    #exec_resource_class: xlarge
 +-  parallelism: 4
 ++    exec_resource_class: medium
 ++  parallelism: 25
 + 
 + j11_small_par_executor: &j11_small_par_executor
 +   executor:
 +     name: java11-executor
 +-    #exec_resource_class: xlarge
 +-  parallelism: 1
 ++    #exec_resource_class: large
 ++  parallelism: 10
 + 
 + j11_small_executor: &j11_small_executor
 +   executor:
- @@ -146,35 +158,47 @@
++@@ -181,35 +193,47 @@
 +     #exec_resource_class: medium
 +   parallelism: 1
 + 
 ++j11_large_par_executor: &j11_large_par_executor
 ++  executor:
 ++    name: java11-executor
 ++    exec_resource_class: large
 ++  parallelism: 50
 ++
   j8_repeated_utest_executor: &j8_repeated_utest_executor
     executor:
       name: java8-executor
@@@ -103,177 -71,32 +103,177 @@@
  +    exec_resource_class: large
  +  parallelism: 25
   
 - separate_jobs: &separate_jobs
 + j11_repeated_utest_executor: &j11_repeated_utest_executor
 +   executor:
 +     name: java11-executor
 +-  parallelism: 4
 ++    exec_resource_class: medium
 ++  parallelism: 25
 + 
 + j11_repeated_dtest_executor: &j11_repeated_dtest_executor
 +   executor:
 +     name: java11-executor
 +-  parallelism: 4
 ++    exec_resource_class: large
 ++  parallelism: 25
 + 
-  j8_with_dtests_jobs: &j8_with_dtests_jobs
++ j8_separate_jobs: &j8_separate_jobs
     jobs:
- @@ -869,7 +893,7 @@
 -@@ -500,7 +520,7 @@
 -           target: stress-test
++@@ -983,7 +1007,7 @@
 +           target: testclasslist-system-keyspace-directory
   
-    j8_dtests-with-vnodes:
+    j8_dtests_vnode:
  -    <<: *j8_par_executor
  +    <<: *j8_large_par_executor
       steps:
         - attach_workspace:
             at: /home/cassandra
- @@ -883,7 +907,7 @@
 -@@ -514,7 +534,7 @@
 -           pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
++@@ -997,7 +1021,7 @@
 +           pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 + 
-    j11_dtests-with-vnodes:
++   j11_dtests_vnode:
 +-    <<: *j11_par_executor
 ++    <<: *j11_large_par_executor
 +     steps:
 +     - attach_workspace:
 +         at: /home/cassandra
- @@ -898,7 +922,7 @@
++@@ -1012,7 +1036,7 @@
 +         pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
   
-    j8_dtests-no-vnodes:
+    j8_dtests:
  -    <<: *j8_par_executor
  +    <<: *j8_large_par_executor
       steps:
         - attach_workspace:
             at: /home/cassandra
- @@ -912,7 +936,7 @@
 -@@ -528,7 +548,7 @@
++@@ -1026,7 +1050,7 @@
             pytest_extra_args: '--skip-resource-intensive-tests'
   
-    j11_dtests-no-vnodes:
++   j11_dtests:
 +-    <<: *j11_par_executor
 ++    <<: *j11_large_par_executor
 +     steps:
 +     - attach_workspace:
 +         at: /home/cassandra
- @@ -927,7 +951,7 @@
++@@ -1041,7 +1065,7 @@
 +         pytest_extra_args: '--skip-resource-intensive-tests'
 + 
-    j8_upgradetests-no-vnodes:
+    j8_upgrade_dtests:
  -    <<: *j8_par_executor
  +    <<: *j8_very_large_par_executor
       steps:
         - attach_workspace:
             at: /home/cassandra
- @@ -941,7 +965,7 @@
++@@ -1055,7 +1079,7 @@
 +           pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
 + 
 +   j8_cqlsh-dtests-py2-with-vnodes:
 +-    <<: *j8_par_executor
 ++    <<: *j8_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -956,7 +980,7 @@
++@@ -1070,7 +1094,7 @@
 +           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
 + 
-    j8_cqlsh-dtests-py3-with-vnodes:
++   j8_cqlsh_dtests_py3_vnode:
 +-    <<: *j8_par_executor
 ++    <<: *j8_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -971,7 +995,7 @@
++@@ -1085,7 +1109,7 @@
 +           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 + 
-    j8_cqlsh-dtests-py38-with-vnodes:
++   j8_cqlsh_dtests_py38_vnode:
 +-    <<: *j8_par_executor
 ++    <<: *j8_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -989,7 +1013,7 @@
++@@ -1103,7 +1127,7 @@
 +           python_version: '3.8'
 + 
 +   j8_cqlsh-dtests-py2-no-vnodes:
 +-    <<: *j8_par_executor
 ++    <<: *j8_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -1004,7 +1028,7 @@
++@@ -1118,7 +1142,7 @@
 +           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
 + 
-    j8_cqlsh-dtests-py3-no-vnodes:
++   j8_cqlsh_dtests_py3:
 +-    <<: *j8_par_executor
 ++    <<: *j8_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -1019,7 +1043,7 @@
++@@ -1133,7 +1157,7 @@
 +           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 + 
-    j8_cqlsh-dtests-py38-no-vnodes:
++   j8_cqlsh_dtests_py38:
 +-    <<: *j8_par_executor
 ++    <<: *j8_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -1037,7 +1061,7 @@
++@@ -1151,7 +1175,7 @@
 +           python_version: '3.8'
 + 
 +   j11_cqlsh-dtests-py2-with-vnodes:
 +-    <<: *j11_par_executor
 ++    <<: *j11_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -1052,7 +1076,7 @@
++@@ -1166,7 +1190,7 @@
 +           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
 + 
-    j11_cqlsh-dtests-py3-with-vnodes:
++   j11_cqlsh_dtests_py3_vnode:
 +-    <<: *j11_par_executor
 ++    <<: *j11_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -1067,7 +1091,7 @@
++@@ -1181,7 +1205,7 @@
 +           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 + 
-    j11_cqlsh-dtests-py38-with-vnodes:
++   j11_cqlsh_dtests_py38_vnode:
 +-    <<: *j11_par_executor
 ++    <<: *j11_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -1085,7 +1109,7 @@
++@@ -1199,7 +1223,7 @@
 +           python_version: '3.8'
 + 
 +   j11_cqlsh-dtests-py2-no-vnodes:
 +-    <<: *j11_par_executor
 ++    <<: *j11_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -1100,7 +1124,7 @@
++@@ -1214,7 +1238,7 @@
 +           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
 + 
-    j11_cqlsh-dtests-py3-no-vnodes:
++   j11_cqlsh_dtests_py3:
 +-    <<: *j11_par_executor
 ++    <<: *j11_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -1115,7 +1139,7 @@
++@@ -1229,7 +1253,7 @@
 +           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 + 
-    j11_cqlsh-dtests-py38-no-vnodes:
++   j11_cqlsh_dtests_py38:
 +-    <<: *j11_par_executor
 ++    <<: *j11_large_par_executor
 +     steps:
 +       - attach_workspace:
 +           at: /home/cassandra
- @@ -1757,3 +1781,4 @@
++@@ -2156,3 +2180,4 @@
 +       - store_artifacts:
 +           path: ~/cassandra-dtest/logs
 +           destination: dtest_logs
 ++
diff --cc .circleci/config.yml
index 6e941ea5ea,ed0689d749..afeb6e8288
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@@ -109,25 -108,28 +109,30 @@@ jobs
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   repeated_jvm_upgrade_dtest:
+   utests_compression_repeat:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
      resource_class: medium
@@@ -200,10 -201,12 +204,13 @@@
                if [[ $target == "test" || \
                      $target == "test-cdc" || \
                      $target == "test-compression" || \
-                     $target == "test-system-keyspace-directory" ]]; then
-                 name="-Dtest.name=$class_name"
+                     $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
+                     $target == "long-test" || \
+                     $target == "stress-test" ]]; then
+                 name_arg="-Dtest.name=${class##*.}"
                else
-                 name="-Dtest.name=$class_path"
+                 name_arg="-Dtest.name=$class"
                fi
  
                # Prepare the -Dtest.methods argument, which is optional
@@@ -253,120 -255,22 +259,123 @@@
                    break
                  fi
                done
- 
-               (exit ${exit_code})
-             fi
-           fi
+           done
+           (exit ${exit_code})
      - store_test_results:
-         path: /tmp/results/repeated_utest/output
+         path: /tmp/results/repeated_utests/output
      - store_artifacts:
-         path: /tmp/results/repeated_utest/stdout
+         path: /tmp/results/repeated_utests/stdout
          destination: stdout
      - store_artifacts:
-         path: /tmp/results/repeated_utest/output
+         path: /tmp/results/repeated_utests/output
          destination: junitxml
      - store_artifacts:
-         path: /tmp/results/repeated_utest/logs
+         path: /tmp/results/repeated_utests/logs
          destination: logs
      environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
      - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
 +    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +  j8_cqlsh-dtests-py2-with-vnodes:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
 +        command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
 +        name: Determine Tests to Run (j8_with_vnodes)
 +        no_output_timeout: 5m
 +        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
 +    - run:
 +        name: Run dtests (j8_with_vnodes)
 +        no_output_timeout: 15m
 +        command: |
 +          echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
 +          cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
 +
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
 +            export CQLSH_PYTHON=/usr/bin/python2.7
 +          fi
 +
 +          java -version
 +          cd ~/cassandra-dtest
 +          mkdir -p /tmp/dtest
 +
 +          echo "env: $(env)"
 +          echo "** done env"
 +          mkdir -p /tmp/results/dtests
 +          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
 +          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt`
 +          set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=16 --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j8_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
 +    - store_test_results:
 +        path: /tmp/results
 +    - store_artifacts:
 +        path: /tmp/dtest
 +        destination: dtest_j8_with_vnodes
 +    - store_artifacts:
 +        path: ~/cassandra-dtest/logs
 +        destination: dtest_j8_with_vnodes_logs
 +    environment:
      - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - LANG: en_US.UTF-8
      - KEEP_TEST_DIR: true
      - DEFAULT_DIR: /home/cassandra/cassandra-dtest
@@@ -379,257 -283,28 +388,182 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j11_unit_tests:
++  j11_dtests_vnode_repeat:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
-     - run:
-         name: Determine unit Tests to Run
-         command: |
-           # reminder: this code (along with all the steps) is independently executed on every circle container
-           # so the goal here is to get the circleci script to return the tests *this* container will run
-           # which we do via the `circleci` cli tool.
- 
-           rm -fr ~/cassandra-dtest/upgrade_tests
-           echo "***java tests***"
- 
-           # get all of our unit test filenames
-           set -eo pipefail && circleci tests glob "$HOME/cassandra/test/unit/**/*.java" > /tmp/all_java_unit_tests.txt
- 
-           # split up the unit tests into groups based on the number of containers we have
-           set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
-           set -eo pipefail && cat /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt | sed "s;^/home/cassandra/cassandra/test/unit/;;g" | grep "Test\.java$"  > /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-           echo "** /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt"
-           cat /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
-         no_output_timeout: 15m
 +    - run:
 +        name: Log Environment Information
 +        command: |
 +          echo '*** id ***'
 +          id
 +          echo '*** cat /proc/cpuinfo ***'
 +          cat /proc/cpuinfo
 +          echo '*** free -m ***'
 +          free -m
 +          echo '*** df -m ***'
 +          df -m
 +          echo '*** ifconfig -a ***'
 +          ifconfig -a
 +          echo '*** uname -a ***'
 +          uname -a
 +          echo '*** mount ***'
 +          mount
 +          echo '*** env ***'
 +          env
 +          echo '*** java ***'
 +          which java
 +          java -version
-     - run:
-         name: Run Unit Tests (testclasslist)
-         command: |
-           set -x
-           export PATH=$JAVA_HOME/bin:$PATH
-           time mv ~/cassandra /tmp
-           cd /tmp/cassandra
-           if [ -d ~/dtest_jars ]; then
-             cp ~/dtest_jars/dtest* /tmp/cassandra/build/
-           fi
-           test_timeout=$(grep 'name="test.unit.timeout"' build.xml | awk -F'"' '{print $4}' || true)
-           if [ -z "$test_timeout" ]; then
-             test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"' '{print $4}')
-           fi
-           ant testclasslist -Dtest.timeout="$test_timeout" -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt  -Dtest.classlistprefix=unit
-         no_output_timeout: 15m
-     - store_test_results:
-         path: /tmp/cassandra/build/test/output/
-     - store_artifacts:
-         path: /tmp/cassandra/build/test/output
-         destination: junitxml
-     - store_artifacts:
-         path: /tmp/cassandra/build/test/logs
-         destination: logs
-     environment:
-     - ANT_HOME: /usr/share/ant
-     - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - LANG: en_US.UTF-8
-     - KEEP_TEST_DIR: true
-     - DEFAULT_DIR: /home/cassandra/cassandra-dtest
-     - PYTHONIOENCODING: utf-8
-     - PYTHONUNBUFFERED: true
-     - CASS_DRIVER_NO_EXTENSIONS: true
-     - CASS_DRIVER_NO_CYTHON: true
-     - CASSANDRA_SKIP_SYNC: true
-     - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
-     - DTEST_BRANCH: trunk
-     - CCM_MAX_HEAP_SIZE: 1024M
-     - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - CASSANDRA_USE_JDK11: true
-   repeated_upgrade_dtest:
-     docker:
-     - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
-     resource_class: medium
-     working_directory: ~/
-     shell: /bin/bash -eo pipefail -l
-     parallelism: 4
-     steps:
-     - attach_workspace:
-         at: /home/cassandra
 +    - run:
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
 +        command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
 +        name: Run repeated Python dtest
 +        no_output_timeout: 15m
 +        command: |
-           if [ "${REPEATED_UPGRADE_DTEST_NAME}" == "<nil>" ]; then
++          if [ "${REPEATED_DTESTS}" == "<nil>" ]; then
 +            echo "Repeated dtest name hasn't been defined, exiting without running any test"
-           elif [ "${REPEATED_UPGRADE_DTEST_COUNT}" == "<nil>" ]; then
++          elif [ "${REPEATED_DTESTS_COUNT}" == "<nil>" ]; then
 +            echo "Repeated dtest count hasn't been defined, exiting without running any test"
-           elif [ "${REPEATED_UPGRADE_DTEST_COUNT}" -le 0 ]; then
++          elif [ "${REPEATED_DTESTS_COUNT}" -le 0 ]; then
 +            echo "Repeated dtest count is lesser or equals than zero, exiting without running any test"
 +          else
 +
 +            # Calculate the number of test iterations to be run by the current parallel runner.
 +            # Since we are running the same test multiple times there is no need to use `circleci tests split`.
-             count=$((${REPEATED_UPGRADE_DTEST_COUNT} / CIRCLE_NODE_TOTAL))
-             if (($CIRCLE_NODE_INDEX < (${REPEATED_UPGRADE_DTEST_COUNT} % CIRCLE_NODE_TOTAL))); then
++            count=$((${REPEATED_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
++            if (($CIRCLE_NODE_INDEX < (${REPEATED_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
 +              count=$((count+1))
 +            fi
 +
 +            if (($count <= 0)); then
 +              echo "No tests to run in this runner"
 +            else
-               echo "Running ${REPEATED_UPGRADE_DTEST_NAME} $count times"
++              echo "Running ${REPEATED_DTESTS} $count times"
 +
 +              source ~/env3.6/bin/activate
 +              export PATH=$JAVA_HOME/bin:$PATH
 +
 +              java -version
 +              cd ~/cassandra-dtest
 +              mkdir -p /tmp/dtest
 +
 +              echo "env: $(env)"
 +              echo "** done env"
 +              mkdir -p /tmp/results/dtests
 +
++              tests_arg=$(echo ${REPEATED_DTESTS} | sed -e "s/,/ /g")
++
 +              stop_on_failure_arg=""
-               if ${REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE}; then
++              if ${REPEATED_TESTS_STOP_ON_FAILURE}; then
 +                stop_on_failure_arg="-x"
 +              fi
 +
 +              vnodes_args=""
-               if false; then
++              if true; then
 +                vnodes_args="--use-vnodes --num-tokens=16"
 +              fi
 +
 +              upgrade_arg=""
-               if true; then
-                 upgrade_arg="--execute-upgrade-tests"
++              if false; then
++                upgrade_arg="--execute-upgrade-tests --upgrade-target-version-only --upgrade-version-selection all"
 +              fi
 +
 +              # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-               set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir ${REPEATED_UPGRADE_DTEST_NAME} | tee /tmp/dtest/stdout.txt
++              set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $tests_arg | tee /tmp/dtest/stdout.txt
 +            fi
 +          fi
 +    - store_test_results:
 +        path: /tmp/results
 +    - store_artifacts:
 +        path: /tmp/dtest
 +        destination: dtest
 +    - store_artifacts:
 +        path: ~/cassandra-dtest/logs
 +        destination: dtest_logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j8_cqlsh-dtests-py38-no-vnodes:
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - CASSANDRA_USE_JDK11: true
+   utests_stress_repeat:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
      resource_class: medium
@@@ -640,60 -315,137 +574,139 @@@
      - attach_workspace:
          at: /home/cassandra
      - run:
-         name: Clone Cassandra dtest Repository (via git)
-         command: |
-           git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
-     - run:
-         name: Configure virtualenv and python Dependencies
+         name: Log Environment Information
          command: |
-           # note, this should be super quick as all dependencies should be pre-installed in the docker image
-           # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
-           # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
-           # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
-           source ~/env3.8/bin/activate
-           export PATH=$JAVA_HOME/bin:$PATH
-           pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
-           pip3 uninstall -y cqlsh
-           pip3 freeze
-     - run:
-         name: Determine Tests to Run (j8_without_vnodes)
-         no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
+           echo '*** id ***'
+           id
+           echo '*** cat /proc/cpuinfo ***'
+           cat /proc/cpuinfo
+           echo '*** free -m ***'
+           free -m
+           echo '*** df -m ***'
+           df -m
+           echo '*** ifconfig -a ***'
+           ifconfig -a
+           echo '*** uname -a ***'
+           uname -a
+           echo '*** mount ***'
+           mount
+           echo '*** env ***'
+           env
+           echo '*** java ***'
+           which java
+           java -version
      - run:
-         name: Run dtests (j8_without_vnodes)
+         name: Repeatedly run new or modifed JUnit tests
          no_output_timeout: 15m
          command: |
-           echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
-           cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
- 
-           source ~/env3.8/bin/activate
+           set -x
            export PATH=$JAVA_HOME/bin:$PATH
-           if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
-             export CQLSH_PYTHON=/usr/bin/python3.8
+           time mv ~/cassandra /tmp
+           cd /tmp/cassandra
+           if [ -d ~/dtest_jars ]; then
+             cp ~/dtest_jars/dtest* /tmp/cassandra/build/
            fi
  
-           java -version
-           cd ~/cassandra-dtest
-           mkdir -p /tmp/dtest
+           # Calculate the number of test iterations to be run by the current parallel runner.
+           count=$((${REPEATED_UTESTS_STRESS_COUNT} / CIRCLE_NODE_TOTAL))
+           if (($CIRCLE_NODE_INDEX < (${REPEATED_UTESTS_STRESS_COUNT} % CIRCLE_NODE_TOTAL))); then
+             count=$((count+1))
+           fi
  
-           echo "env: $(env)"
-           echo "** done env"
-           mkdir -p /tmp/results/dtests
-           # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-           export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt`
-           set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j8_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+           # Put manually specified tests and automatically detected tests together, removing duplicates
+           tests=$(echo ${REPEATED_UTESTS_STRESS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
+           echo "Tests to be repeated: ${tests}"
+ 
+           # Run each test class as many times as requested.
+           exit_code="$?"
+           for test in $tests; do
+ 
+               # Split class and method names from the test name
+               if [[ $test =~ "#" ]]; then
+                 class=${test%"#"*}
+                 method=${test#*"#"}
+               else
+                 class=$test
+                 method=""
+               fi
+ 
+               # Prepare the -Dtest.name argument.
+               # It can be the fully qualified class name or the short class name, depending on the target.
+               if [[ $target == "test" || \
+                     $target == "test-cdc" || \
+                     $target == "test-compression" || \
+                     $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
+                     $target == "long-test" || \
+                     $target == "stress-test" ]]; then
+                 name_arg="-Dtest.name=${class##*.}"
+               else
+                 name_arg="-Dtest.name=$class"
+               fi
+ 
+               # Prepare the -Dtest.methods argument, which is optional
+               if [ $method == "" ]; then
+                 methods_arg=""
+               else
+                 methods_arg="-Dtest.methods=$method"
+               fi
+ 
+               for i in $(seq -w 1 $count); do
+                 echo "Running test $test, iteration $i of $count"
+ 
+                 # run the test
+                 status="passes"
+                 if !( set -o pipefail && \
+                       ant stress-test-some $name_arg $methods_arg -Dno-build-test=true | \
+                       tee stdout.txt \
+                     ); then
+                   status="fails"
+                   exit_code=1
+                 fi
+ 
+                 # move the stdout output file
+                 dest=/tmp/results/repeated_utests/stdout/${status}/${i}
+                 mkdir -p $dest
+                 mv stdout.txt $dest/${test}.txt
+ 
+                 # move the XML output files
+                 source=build/test/output
+                 dest=/tmp/results/repeated_utests/output/${status}/${i}
+                 mkdir -p $dest
+                 if [[ -d $source && -n "$(ls $source)" ]]; then
+                   mv $source/* $dest/
+                 fi
+ 
+                 # move the log files
+                 source=build/test/logs
+                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
+                 mkdir -p $dest
+                 if [[ -d $source && -n "$(ls $source)" ]]; then
+                   mv $source/* $dest/
+                 fi
+ 
+                 # maybe stop iterations on test failure
+                 if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
+                   break
+                 fi
+               done
+           done
+           (exit ${exit_code})
      - store_test_results:
-         path: /tmp/results
+         path: /tmp/results/repeated_utests/output
      - store_artifacts:
-         path: /tmp/dtest
-         destination: dtest_j8_without_vnodes
+         path: /tmp/results/repeated_utests/stdout
+         destination: stdout
      - store_artifacts:
-         path: ~/cassandra-dtest/logs
-         destination: dtest_j8_without_vnodes_logs
+         path: /tmp/results/repeated_utests/output
+         destination: junitxml
+     - store_artifacts:
+         path: /tmp/results/repeated_utests/logs
+         destination: logs
      environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - LANG: en_US.UTF-8
      - KEEP_TEST_DIR: true
      - DEFAULT_DIR: /home/cassandra/cassandra-dtest
@@@ -706,27 -458,30 +719,32 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j11_cqlsh-dtests-py3-with-vnodes:
 -  utests_long_repeat:
++  j11_unit_tests:
      docker:
 -    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    - image: apache/cassandra-testing-ubuntu2004-java11:latest
      resource_class: medium
      working_directory: ~/
      shell: /bin/bash -eo pipefail -l
@@@ -734,61 -489,313 +752,176 @@@
      steps:
      - attach_workspace:
          at: /home/cassandra
 +    - run:
-         name: Clone Cassandra dtest Repository (via git)
-         command: |
-           git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
-     - run:
-         name: Configure virtualenv and python Dependencies
++        name: Determine unit Tests to Run
++        command: |
++          # reminder: this code (along with all the steps) is independently executed on every circle container
++          # so the goal here is to get the circleci script to return the tests *this* container will run
++          # which we do via the `circleci` cli tool.
++
++          rm -fr ~/cassandra-dtest/upgrade_tests
++          echo "***java tests***"
++
++          # get all of our unit test filenames
++          set -eo pipefail && circleci tests glob "$HOME/cassandra/test/unit/**/*.java" > /tmp/all_java_unit_tests.txt
++
++          # split up the unit tests into groups based on the number of containers we have
++          set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
++          set -eo pipefail && cat /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt | sed "s;^/home/cassandra/cassandra/test/unit/;;g" | grep "Test\.java$"  > /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
++          echo "** /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt"
++          cat /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
++        no_output_timeout: 15m
+     - run:
+         name: Log Environment Information
+         command: |
+           echo '*** id ***'
+           id
+           echo '*** cat /proc/cpuinfo ***'
+           cat /proc/cpuinfo
+           echo '*** free -m ***'
+           free -m
+           echo '*** df -m ***'
+           df -m
+           echo '*** ifconfig -a ***'
+           ifconfig -a
+           echo '*** uname -a ***'
+           uname -a
+           echo '*** mount ***'
+           mount
+           echo '*** env ***'
+           env
+           echo '*** java ***'
+           which java
+           java -version
+     - run:
 -        name: Repeatedly run new or modifed JUnit tests
 -        no_output_timeout: 15m
++        name: Run Unit Tests (testclasslist)
+         command: |
+           set -x
+           export PATH=$JAVA_HOME/bin:$PATH
+           time mv ~/cassandra /tmp
+           cd /tmp/cassandra
+           if [ -d ~/dtest_jars ]; then
+             cp ~/dtest_jars/dtest* /tmp/cassandra/build/
+           fi
 -
 -          # Calculate the number of test iterations to be run by the current parallel runner.
 -          count=$((${REPEATED_UTESTS_LONG_COUNT} / CIRCLE_NODE_TOTAL))
 -          if (($CIRCLE_NODE_INDEX < (${REPEATED_UTESTS_LONG_COUNT} % CIRCLE_NODE_TOTAL))); then
 -            count=$((count+1))
++          test_timeout=$(grep 'name="test.unit.timeout"' build.xml | awk -F'"' '{print $4}' || true)
++          if [ -z "$test_timeout" ]; then
++            test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"' '{print $4}')
+           fi
 -
 -          # Put manually specified tests and automatically detected tests together, removing duplicates
 -          tests=$(echo ${REPEATED_UTESTS_LONG} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
 -          echo "Tests to be repeated: ${tests}"
 -
 -          # Run each test class as many times as requested.
 -          exit_code="$?"
 -          for test in $tests; do
 -
 -              # Split class and method names from the test name
 -              if [[ $test =~ "#" ]]; then
 -                class=${test%"#"*}
 -                method=${test#*"#"}
 -              else
 -                class=$test
 -                method=""
 -              fi
 -
 -              # Prepare the -Dtest.name argument.
 -              # It can be the fully qualified class name or the short class name, depending on the target.
 -              if [[ $target == "test" || \
 -                    $target == "test-cdc" || \
 -                    $target == "test-compression" || \
 -                    $target == "test-system-keyspace-directory" || \
 -                    $target == "long-test" || \
 -                    $target == "stress-test" ]]; then
 -                name_arg="-Dtest.name=${class##*.}"
 -              else
 -                name_arg="-Dtest.name=$class"
 -              fi
 -
 -              # Prepare the -Dtest.methods argument, which is optional
 -              if [ $method == "" ]; then
 -                methods_arg=""
 -              else
 -                methods_arg="-Dtest.methods=$method"
 -              fi
 -
 -              for i in $(seq -w 1 $count); do
 -                echo "Running test $test, iteration $i of $count"
 -
 -                # run the test
 -                status="passes"
 -                if !( set -o pipefail && \
 -                      ant long-testsome $name_arg $methods_arg -Dno-build-test=true | \
 -                      tee stdout.txt \
 -                    ); then
 -                  status="fails"
 -                  exit_code=1
 -                fi
 -
 -                # move the stdout output file
 -                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
 -                mkdir -p $dest
 -                mv stdout.txt $dest/${test}.txt
 -
 -                # move the XML output files
 -                source=build/test/output
 -                dest=/tmp/results/repeated_utests/output/${status}/${i}
 -                mkdir -p $dest
 -                if [[ -d $source && -n "$(ls $source)" ]]; then
 -                  mv $source/* $dest/
 -                fi
 -
 -                # move the log files
 -                source=build/test/logs
 -                dest=/tmp/results/repeated_utests/logs/${status}/${i}
 -                mkdir -p $dest
 -                if [[ -d $source && -n "$(ls $source)" ]]; then
 -                  mv $source/* $dest/
 -                fi
 -
 -                # maybe stop iterations on test failure
 -                if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
 -                  break
 -                fi
 -              done
 -          done
 -          (exit ${exit_code})
++          ant testclasslist -Dtest.timeout="$test_timeout" -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt  -Dtest.classlistprefix=unit
++        no_output_timeout: 15m
+     - store_test_results:
 -        path: /tmp/results/repeated_utests/output
 -    - store_artifacts:
 -        path: /tmp/results/repeated_utests/stdout
 -        destination: stdout
++        path: /tmp/cassandra/build/test/output/
+     - store_artifacts:
 -        path: /tmp/results/repeated_utests/output
++        path: /tmp/cassandra/build/test/output
+         destination: junitxml
+     - store_artifacts:
 -        path: /tmp/results/repeated_utests/logs
++        path: /tmp/cassandra/build/test/logs
+         destination: logs
+     environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - LANG: en_US.UTF-8
+     - KEEP_TEST_DIR: true
+     - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+     - PYTHONIOENCODING: utf-8
+     - PYTHONUNBUFFERED: true
+     - CASS_DRIVER_NO_EXTENSIONS: true
+     - CASS_DRIVER_NO_CYTHON: true
+     - CASSANDRA_SKIP_SYNC: true
+     - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
+     - DTEST_BRANCH: trunk
+     - CCM_MAX_HEAP_SIZE: 1024M
+     - CCM_HEAP_NEWSIZE: 256M
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
 -    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  j8_unit_tests_repeat:
++    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - CASSANDRA_USE_JDK11: true
++  j8_cqlsh_dtests_py3:
+     docker:
+     - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
+     resource_class: medium
+     working_directory: ~/
+     shell: /bin/bash -eo pipefail -l
+     parallelism: 4
+     steps:
+     - attach_workspace:
+         at: /home/cassandra
+     - run:
 -        name: Log Environment Information
++        name: Clone Cassandra dtest Repository (via git)
+         command: |
 -          echo '*** id ***'
 -          id
 -          echo '*** cat /proc/cpuinfo ***'
 -          cat /proc/cpuinfo
 -          echo '*** free -m ***'
 -          free -m
 -          echo '*** df -m ***'
 -          df -m
 -          echo '*** ifconfig -a ***'
 -          ifconfig -a
 -          echo '*** uname -a ***'
 -          uname -a
 -          echo '*** mount ***'
 -          mount
 -          echo '*** env ***'
 -          env
 -          echo '*** java ***'
 -          which java
 -          java -version
++          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+     - run:
 -        name: Repeatedly run new or modifed JUnit tests
 -        no_output_timeout: 15m
++        name: Configure virtualenv and python Dependencies
          command: |
 -          set -x
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 +          source ~/env3.6/bin/activate
            export PATH=$JAVA_HOME/bin:$PATH
 -          time mv ~/cassandra /tmp
 -          cd /tmp/cassandra
 -          if [ -d ~/dtest_jars ]; then
 -            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 -          fi
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
-         name: Determine Tests to Run (j11_with_vnodes)
++        name: Determine Tests to Run (j8_without_vnodes)
 +        no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip [...]
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
 +    - run:
-         name: Run dtests (j11_with_vnodes)
++        name: Run dtests (j8_without_vnodes)
 +        no_output_timeout: 15m
 +        command: |
-           echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
-           cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
++          echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
++          cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
  
 -          # Calculate the number of test iterations to be run by the current parallel runner.
 -          count=$((${REPEATED_UTESTS_COUNT} / CIRCLE_NODE_TOTAL))
 -          if (($CIRCLE_NODE_INDEX < (${REPEATED_UTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
 -            count=$((count+1))
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
 +            export CQLSH_PYTHON=/usr/bin/python3.6
            fi
  
 -          # Put manually specified tests and automatically detected tests together, removing duplicates
 -          tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
 -          echo "Tests to be repeated: ${tests}"
 -
 -          # Run each test class as many times as requested.
 -          exit_code="$?"
 -          for test in $tests; do
 -
 -              # Split class and method names from the test name
 -              if [[ $test =~ "#" ]]; then
 -                class=${test%"#"*}
 -                method=${test#*"#"}
 -              else
 -                class=$test
 -                method=""
 -              fi
 -
 -              # Prepare the -Dtest.name argument.
 -              # It can be the fully qualified class name or the short class name, depending on the target.
 -              if [[ $target == "test" || \
 -                    $target == "test-cdc" || \
 -                    $target == "test-compression" || \
 -                    $target == "test-system-keyspace-directory" || \
 -                    $target == "long-test" || \
 -                    $target == "stress-test" ]]; then
 -                name_arg="-Dtest.name=${class##*.}"
 -              else
 -                name_arg="-Dtest.name=$class"
 -              fi
 -
 -              # Prepare the -Dtest.methods argument, which is optional
 -              if [ $method == "" ]; then
 -                methods_arg=""
 -              else
 -                methods_arg="-Dtest.methods=$method"
 -              fi
 -
 -              for i in $(seq -w 1 $count); do
 -                echo "Running test $test, iteration $i of $count"
 -
 -                # run the test
 -                status="passes"
 -                if !( set -o pipefail && \
 -                      ant testsome $name_arg $methods_arg -Dno-build-test=true | \
 -                      tee stdout.txt \
 -                    ); then
 -                  status="fails"
 -                  exit_code=1
 -                fi
 -
 -                # move the stdout output file
 -                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
 -                mkdir -p $dest
 -                mv stdout.txt $dest/${test}.txt
 -
 -                # move the XML output files
 -                source=build/test/output
 -                dest=/tmp/results/repeated_utests/output/${status}/${i}
 -                mkdir -p $dest
 -                if [[ -d $source && -n "$(ls $source)" ]]; then
 -                  mv $source/* $dest/
 -                fi
 -
 -                # move the log files
 -                source=build/test/logs
 -                dest=/tmp/results/repeated_utests/logs/${status}/${i}
 -                mkdir -p $dest
 -                if [[ -d $source && -n "$(ls $source)" ]]; then
 -                  mv $source/* $dest/
 -                fi
 +          java -version
 +          cd ~/cassandra-dtest
 +          mkdir -p /tmp/dtest
  
 -                # maybe stop iterations on test failure
 -                if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
 -                  break
 -                fi
 -              done
 -          done
 -          (exit ${exit_code})
 +          echo "env: $(env)"
 +          echo "** done env"
 +          mkdir -p /tmp/results/dtests
 +          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-           export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt`
-           set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=16 --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j11_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt`
++          set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j8_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
      - store_test_results:
 -        path: /tmp/results/repeated_utests/output
 -    - store_artifacts:
 -        path: /tmp/results/repeated_utests/stdout
 -        destination: stdout
 +        path: /tmp/results
      - store_artifacts:
 -        path: /tmp/results/repeated_utests/output
 -        destination: junitxml
 +        path: /tmp/dtest
-         destination: dtest_j11_with_vnodes
++        destination: dtest_j8_without_vnodes
      - store_artifacts:
 -        path: /tmp/results/repeated_utests/logs
 -        destination: logs
 +        path: ~/cassandra-dtest/logs
-         destination: dtest_j11_with_vnodes_logs
++        destination: dtest_j8_without_vnodes_logs
      environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - LANG: en_US.UTF-8
      - KEEP_TEST_DIR: true
      - DEFAULT_DIR: /home/cassandra/cassandra-dtest
@@@ -801,28 -808,30 +934,32 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - CASSANDRA_USE_JDK11: true
-   j11_cqlsh-dtests-py3-no-vnodes:
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
+     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  j8_upgrade_dtests_repeat:
++  j11_cqlsh_dtests_py38:
      docker:
 -    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    - image: apache/cassandra-testing-ubuntu2004-java11:latest
      resource_class: medium
      working_directory: ~/
      shell: /bin/bash -eo pipefail -l
@@@ -841,38 -850,66 +978,38 @@@
            # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
            # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
            # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
--          source ~/env3.6/bin/activate
++          source ~/env3.8/bin/activate
            export PATH=$JAVA_HOME/bin:$PATH
 -          pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
            pip3 freeze
      - run:
 -        name: Run repeated Python dtest
 +        name: Determine Tests to Run (j11_without_vnodes)
 +        no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource- [...]
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource- [...]
 +    - run:
 +        name: Run dtests (j11_without_vnodes)
          no_output_timeout: 15m
          command: |
 -          if [ "${REPEATED_UPGRADE_DTESTS}" == "<nil>" ]; then
 -            echo "Repeated dtest name hasn't been defined, exiting without running any test"
 -          elif [ "${REPEATED_UPGRADE_DTESTS_COUNT}" == "<nil>" ]; then
 -            echo "Repeated dtest count hasn't been defined, exiting without running any test"
 -          elif [ "${REPEATED_UPGRADE_DTESTS_COUNT}" -le 0 ]; then
 -            echo "Repeated dtest count is lesser or equals than zero, exiting without running any test"
 -          else
 -
 -            # Calculate the number of test iterations to be run by the current parallel runner.
 -            # Since we are running the same test multiple times there is no need to use `circleci tests split`.
 -            count=$((${REPEATED_UPGRADE_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
 -            if (($CIRCLE_NODE_INDEX < (${REPEATED_UPGRADE_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
 -              count=$((count+1))
 -            fi
 -
 -            if (($count <= 0)); then
 -              echo "No tests to run in this runner"
 -            else
 -              echo "Running ${REPEATED_UPGRADE_DTESTS} $count times"
 -
 -              source ~/env3.6/bin/activate
 -              export PATH=$JAVA_HOME/bin:$PATH
 -
 -              java -version
 -              cd ~/cassandra-dtest
 -              mkdir -p /tmp/dtest
 -
 -              echo "env: $(env)"
 -              echo "** done env"
 -              mkdir -p /tmp/results/dtests
 -
 -              tests_arg=$(echo ${REPEATED_UPGRADE_DTESTS} | sed -e "s/,/ /g")
 -
 -              stop_on_failure_arg=""
 -              if ${REPEATED_TESTS_STOP_ON_FAILURE}; then
 -                stop_on_failure_arg="-x"
 -              fi
 +          echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
 +          cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
  
-           source ~/env3.6/bin/activate
 -              vnodes_args=""
 -              if false; then
 -                vnodes_args="--use-vnodes --num-tokens=16"
 -              fi
++          source ~/env3.8/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
-           if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
-             export CQLSH_PYTHON=/usr/bin/python3.6
++          if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
++            export CQLSH_PYTHON=/usr/bin/python3.8
 +          fi
  
 -              upgrade_arg=""
 -              if true; then
 -                upgrade_arg="--execute-upgrade-tests --upgrade-target-version-only --upgrade-version-selection all"
 -              fi
 +          java -version
 +          cd ~/cassandra-dtest
 +          mkdir -p /tmp/dtest
  
 -              # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
 -              set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $tests_arg | tee /tmp/dtest/stdout.txt
 -            fi
 -          fi
 +          echo "env: $(env)"
 +          echo "** done env"
 +          mkdir -p /tmp/results/dtests
 +          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
 +          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt`
 +          set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j11_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
      - store_test_results:
          path: /tmp/results
      - store_artifacts:
@@@ -897,1602 -933,219 +1034,3352 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
 -    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  build:
 +    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - CASSANDRA_USE_JDK11: true
-   j11_cqlsh-dtests-py38-with-vnodes:
++  j11_repeated_ant_test:
      docker:
 -    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    - image: apache/cassandra-testing-ubuntu2004-java11:latest
      resource_class: medium
      working_directory: ~/
      shell: /bin/bash -eo pipefail -l
 -    parallelism: 1
 +    parallelism: 4
      steps:
 +    - attach_workspace:
 +        at: /home/cassandra
      - run:
-         name: Clone Cassandra dtest Repository (via git)
-         command: |
-           git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
-     - run:
-         name: Configure virtualenv and python Dependencies
+         name: Log Environment Information
          command: |
-           # note, this should be super quick as all dependencies should be pre-installed in the docker image
-           # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
-           # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
-           # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
-           source ~/env3.8/bin/activate
-           export PATH=$JAVA_HOME/bin:$PATH
-           pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
-           pip3 uninstall -y cqlsh
-           pip3 freeze
-     - run:
-         name: Determine Tests to Run (j11_with_vnodes)
-         no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip [...]
+           echo '*** id ***'
+           id
+           echo '*** cat /proc/cpuinfo ***'
+           cat /proc/cpuinfo
+           echo '*** free -m ***'
+           free -m
+           echo '*** df -m ***'
+           df -m
+           echo '*** ifconfig -a ***'
+           ifconfig -a
+           echo '*** uname -a ***'
+           uname -a
+           echo '*** mount ***'
+           mount
+           echo '*** env ***'
+           env
+           echo '*** java ***'
+           which java
+           java -version
      - run:
-         name: Run dtests (j11_with_vnodes)
 -        name: Clone Cassandra Repository (via git)
 -        command: |
 -          git clone --single-branch --depth 1 --branch $CIRCLE_BRANCH https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git ~/cassandra
 -    - run:
 -        name: Build Cassandra
++        name: Run repeated JUnit test
 +        no_output_timeout: 15m
          command: |
-           echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
-           cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
 -          export PATH=$JAVA_HOME/bin:$PATH
 -          cd ~/cassandra
 -          # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
 -          for x in $(seq 1 3); do
 -              ${ANT_HOME}/bin/ant clean jar build-test
 -              RETURN="$?"
 -              if [ "${RETURN}" -eq "0" ]; then
 -                  break
++          if [ "${REPEATED_ANT_TEST_CLASS}" == "<nil>" ]; then
++            echo "Repeated utest class name hasn't been defined, exiting without running any test"
++          elif [ "${REPEATED_ANT_TEST_COUNT}" == "<nil>" ]; then
++            echo "Repeated utest count hasn't been defined, exiting without running any test"
++          elif [ "${REPEATED_ANT_TEST_COUNT}" -le 0 ]; then
++            echo "Repeated utest count is lesser or equals than zero, exiting without running any test"
++          else
 +
-           source ~/env3.8/bin/activate
-           export PATH=$JAVA_HOME/bin:$PATH
-           if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
-             export CQLSH_PYTHON=/usr/bin/python3.8
++            # Calculate the number of test iterations to be run by the current parallel runner.
++            # Since we are running the same test multiple times there is no need to use `circleci tests split`.
++            count=$((${REPEATED_ANT_TEST_COUNT} / CIRCLE_NODE_TOTAL))
++            if (($CIRCLE_NODE_INDEX < (${REPEATED_ANT_TEST_COUNT} % CIRCLE_NODE_TOTAL))); then
++              count=$((count+1))
++            fi
++
++            if (($count <= 0)); then
++              echo "No tests to run in this runner"
++            else
++              echo "Running ${REPEATED_ANT_TEST_TARGET} ${REPEATED_ANT_TEST_CLASS} ${REPEATED_ANT_TEST_METHODS} ${REPEATED_ANT_TEST_COUNT} times"
++
++              set -x
++              export PATH=$JAVA_HOME/bin:$PATH
++              time mv ~/cassandra /tmp
++              cd /tmp/cassandra
++              if [ -d ~/dtest_jars ]; then
++                cp ~/dtest_jars/dtest* /tmp/cassandra/build/
+               fi
 -          done
 -          # Exit, if we didn't build successfully
 -          if [ "${RETURN}" -ne "0" ]; then
 -              echo "Build failed with exit code: ${RETURN}"
 -              exit ${RETURN}
++
++              target=${REPEATED_ANT_TEST_TARGET}
++              class_path=${REPEATED_ANT_TEST_CLASS}
++              class_name="${class_path##*.}"
++
++              # Prepare the -Dtest.name argument.
++              # It can be the fully qualified class name or the short class name, depending on the target.
++              if [[ $target == "test" || \
++                    $target == "test-cdc" || \
++                    $target == "test-compression" || \
++                    $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
++                    $target == "long-test" || \
++                    $target == "stress-test" ]]; then
++                name="-Dtest.name=$class_name"
++              else
++                name="-Dtest.name=$class_path"
++              fi
++
++              # Prepare the -Dtest.methods argument, which is optional
++              if [ "${REPEATED_ANT_TEST_METHODS}" == "<nil>" ]; then
++                methods=""
++              else
++                methods="-Dtest.methods=${REPEATED_ANT_TEST_METHODS}"
++              fi
++
++              # Run the test target as many times as requested collecting the exit code,
++              # stopping the iteration only if stop_on_failure is set.
++              exit_code="$?"
++              for i in $(seq -w 1 $count); do
++
++                echo "Running test iteration $i of $count"
++
++                # run the test
++                status="passes"
++                if !( set -o pipefail && ant $target $name $methods -Dno-build-test=true | tee stdout.txt ); then
++                  status="fails"
++                  exit_code=1
++                fi
++
++                # move the stdout output file
++                dest=/tmp/results/repeated_utest/stdout/${status}/${i}
++                mkdir -p $dest
++                mv stdout.txt $dest/${REPEATED_ANT_TEST_TARGET}-${REPEATED_ANT_TEST_CLASS}.txt
++
++                # move the XML output files
++                source=build/test/output
++                dest=/tmp/results/repeated_utest/output/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # move the log files
++                source=build/test/logs
++                dest=/tmp/results/repeated_utest/logs/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # maybe stop iterations on test failure
++                if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
++                  break
++                fi
++              done
++
++              (exit ${exit_code})
++            fi
            fi
 -        no_output_timeout: 15m
 -    - run:
 -        name: Run eclipse-warnings
 -        command: |
 -          export PATH=$JAVA_HOME/bin:$PATH
 -          cd ~/cassandra
 -          ant eclipse-warnings
 -    - persist_to_workspace:
 -        root: /home/cassandra
 -        paths:
 -        - cassandra
 -        - .m2
++    - store_test_results:
++        path: /tmp/results/repeated_utest/output
++    - store_artifacts:
++        path: /tmp/results/repeated_utest/stdout
++        destination: stdout
++    - store_artifacts:
++        path: /tmp/results/repeated_utest/output
++        destination: junitxml
++    - store_artifacts:
++        path: /tmp/results/repeated_utest/logs
++        destination: logs
+     environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - LANG: en_US.UTF-8
+     - KEEP_TEST_DIR: true
+     - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+     - PYTHONIOENCODING: utf-8
+     - PYTHONUNBUFFERED: true
+     - CASS_DRIVER_NO_EXTENSIONS: true
+     - CASS_DRIVER_NO_CYTHON: true
+     - CASSANDRA_SKIP_SYNC: true
+     - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
+     - DTEST_BRANCH: trunk
+     - CCM_MAX_HEAP_SIZE: 1024M
+     - CCM_HEAP_NEWSIZE: 256M
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
 -    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  j8_dtests_vnode_repeat:
++    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - CASSANDRA_USE_JDK11: true
++  j8_cqlsh_dtests_py3_vnode:
+     docker:
+     - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
+     resource_class: medium
+     working_directory: ~/
+     shell: /bin/bash -eo pipefail -l
+     parallelism: 4
+     steps:
+     - attach_workspace:
+         at: /home/cassandra
+     - run:
+         name: Clone Cassandra dtest Repository (via git)
+         command: |
+           git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+     - run:
+         name: Configure virtualenv and python Dependencies
+         command: |
+           # note, this should be super quick as all dependencies should be pre-installed in the docker image
+           # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+           # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+           # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+           source ~/env3.6/bin/activate
+           export PATH=$JAVA_HOME/bin:$PATH
 -          pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
++          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
++          pip3 uninstall -y cqlsh
+           pip3 freeze
+     - run:
 -        name: Run repeated Python dtest
++        name: Determine Tests to Run (j8_with_vnodes)
++        no_output_timeout: 5m
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
++    - run:
++        name: Run dtests (j8_with_vnodes)
+         no_output_timeout: 15m
+         command: |
 -          if [ "${REPEATED_DTESTS}" == "<nil>" ]; then
 -            echo "Repeated dtest name hasn't been defined, exiting without running any test"
 -          elif [ "${REPEATED_DTESTS_COUNT}" == "<nil>" ]; then
 -            echo "Repeated dtest count hasn't been defined, exiting without running any test"
 -          elif [ "${REPEATED_DTESTS_COUNT}" -le 0 ]; then
 -            echo "Repeated dtest count is lesser or equals than zero, exiting without running any test"
 -          else
 -
 -            # Calculate the number of test iterations to be run by the current parallel runner.
 -            # Since we are running the same test multiple times there is no need to use `circleci tests split`.
 -            count=$((${REPEATED_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
 -            if (($CIRCLE_NODE_INDEX < (${REPEATED_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
 -              count=$((count+1))
 -            fi
 -
 -            if (($count <= 0)); then
 -              echo "No tests to run in this runner"
 -            else
 -              echo "Running ${REPEATED_DTESTS} $count times"
 -
 -              source ~/env3.6/bin/activate
 -              export PATH=$JAVA_HOME/bin:$PATH
++          echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
++          cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
+ 
 -              java -version
 -              cd ~/cassandra-dtest
 -              mkdir -p /tmp/dtest
 -
 -              echo "env: $(env)"
 -              echo "** done env"
 -              mkdir -p /tmp/results/dtests
++          source ~/env3.6/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
++            export CQLSH_PYTHON=/usr/bin/python3.6
++          fi
+ 
 -              tests_arg=$(echo ${REPEATED_DTESTS} | sed -e "s/,/ /g")
++          java -version
++          cd ~/cassandra-dtest
++          mkdir -p /tmp/dtest
+ 
 -              stop_on_failure_arg=""
 -              if ${REPEATED_TESTS_STOP_ON_FAILURE}; then
++          echo "env: $(env)"
++          echo "** done env"
++          mkdir -p /tmp/results/dtests
++          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
++          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt`
++          set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=16 --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j8_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++    - store_test_results:
++        path: /tmp/results
++    - store_artifacts:
++        path: /tmp/dtest
++        destination: dtest_j8_with_vnodes
++    - store_artifacts:
++        path: ~/cassandra-dtest/logs
++        destination: dtest_j8_with_vnodes_logs
++    environment:
++    - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - LANG: en_US.UTF-8
++    - KEEP_TEST_DIR: true
++    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
++    - PYTHONIOENCODING: utf-8
++    - PYTHONUNBUFFERED: true
++    - CASS_DRIVER_NO_EXTENSIONS: true
++    - CASS_DRIVER_NO_CYTHON: true
++    - CASSANDRA_SKIP_SYNC: true
++    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
++    - DTEST_BRANCH: trunk
++    - CCM_MAX_HEAP_SIZE: 1024M
++    - CCM_HEAP_NEWSIZE: 256M
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++  j11_cqlsh_dtests_py3:
++    docker:
++    - image: apache/cassandra-testing-ubuntu2004-java11:latest
++    resource_class: medium
++    working_directory: ~/
++    shell: /bin/bash -eo pipefail -l
++    parallelism: 4
++    steps:
++    - attach_workspace:
++        at: /home/cassandra
++    - run:
++        name: Clone Cassandra dtest Repository (via git)
++        command: |
++          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
++    - run:
++        name: Configure virtualenv and python Dependencies
++        command: |
++          # note, this should be super quick as all dependencies should be pre-installed in the docker image
++          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
++          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
++          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
++          source ~/env3.6/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
++          pip3 uninstall -y cqlsh
++          pip3 freeze
++    - run:
++        name: Determine Tests to Run (j11_without_vnodes)
++        no_output_timeout: 5m
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource- [...]
++    - run:
++        name: Run dtests (j11_without_vnodes)
++        no_output_timeout: 15m
++        command: |
++          echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
++          cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
++
++          source ~/env3.6/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
++            export CQLSH_PYTHON=/usr/bin/python3.6
++          fi
++
++          java -version
++          cd ~/cassandra-dtest
++          mkdir -p /tmp/dtest
++
++          echo "env: $(env)"
++          echo "** done env"
++          mkdir -p /tmp/results/dtests
++          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
++          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt`
++          set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j11_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++    - store_test_results:
++        path: /tmp/results
++    - store_artifacts:
++        path: /tmp/dtest
++        destination: dtest_j11_without_vnodes
++    - store_artifacts:
++        path: ~/cassandra-dtest/logs
++        destination: dtest_j11_without_vnodes_logs
++    environment:
++    - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - LANG: en_US.UTF-8
++    - KEEP_TEST_DIR: true
++    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
++    - PYTHONIOENCODING: utf-8
++    - PYTHONUNBUFFERED: true
++    - CASS_DRIVER_NO_EXTENSIONS: true
++    - CASS_DRIVER_NO_CYTHON: true
++    - CASSANDRA_SKIP_SYNC: true
++    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
++    - DTEST_BRANCH: trunk
++    - CCM_MAX_HEAP_SIZE: 1024M
++    - CCM_HEAP_NEWSIZE: 256M
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - CASSANDRA_USE_JDK11: true
++  utests_long_repeat:
++    docker:
++    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
++    resource_class: medium
++    working_directory: ~/
++    shell: /bin/bash -eo pipefail -l
++    parallelism: 4
++    steps:
++    - attach_workspace:
++        at: /home/cassandra
++    - run:
++        name: Log Environment Information
++        command: |
++          echo '*** id ***'
++          id
++          echo '*** cat /proc/cpuinfo ***'
++          cat /proc/cpuinfo
++          echo '*** free -m ***'
++          free -m
++          echo '*** df -m ***'
++          df -m
++          echo '*** ifconfig -a ***'
++          ifconfig -a
++          echo '*** uname -a ***'
++          uname -a
++          echo '*** mount ***'
++          mount
++          echo '*** env ***'
++          env
++          echo '*** java ***'
++          which java
++          java -version
++    - run:
++        name: Repeatedly run new or modifed JUnit tests
++        no_output_timeout: 15m
++        command: |
++          set -x
++          export PATH=$JAVA_HOME/bin:$PATH
++          time mv ~/cassandra /tmp
++          cd /tmp/cassandra
++          if [ -d ~/dtest_jars ]; then
++            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
++          fi
++
++          # Calculate the number of test iterations to be run by the current parallel runner.
++          count=$((${REPEATED_UTESTS_LONG_COUNT} / CIRCLE_NODE_TOTAL))
++          if (($CIRCLE_NODE_INDEX < (${REPEATED_UTESTS_LONG_COUNT} % CIRCLE_NODE_TOTAL))); then
++            count=$((count+1))
++          fi
++
++          # Put manually specified tests and automatically detected tests together, removing duplicates
++          tests=$(echo ${REPEATED_UTESTS_LONG} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
++          echo "Tests to be repeated: ${tests}"
++
++          # Run each test class as many times as requested.
++          exit_code="$?"
++          for test in $tests; do
++
++              # Split class and method names from the test name
++              if [[ $test =~ "#" ]]; then
++                class=${test%"#"*}
++                method=${test#*"#"}
++              else
++                class=$test
++                method=""
++              fi
++
++              # Prepare the -Dtest.name argument.
++              # It can be the fully qualified class name or the short class name, depending on the target.
++              if [[ $target == "test" || \
++                    $target == "test-cdc" || \
++                    $target == "test-compression" || \
++                    $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
++                    $target == "long-test" || \
++                    $target == "stress-test" ]]; then
++                name_arg="-Dtest.name=${class##*.}"
++              else
++                name_arg="-Dtest.name=$class"
++              fi
++
++              # Prepare the -Dtest.methods argument, which is optional
++              if [ $method == "" ]; then
++                methods_arg=""
++              else
++                methods_arg="-Dtest.methods=$method"
++              fi
++
++              for i in $(seq -w 1 $count); do
++                echo "Running test $test, iteration $i of $count"
++
++                # run the test
++                status="passes"
++                if !( set -o pipefail && \
++                      ant long-testsome $name_arg $methods_arg -Dno-build-test=true | \
++                      tee stdout.txt \
++                    ); then
++                  status="fails"
++                  exit_code=1
++                fi
++
++                # move the stdout output file
++                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
++                mkdir -p $dest
++                mv stdout.txt $dest/${test}.txt
++
++                # move the XML output files
++                source=build/test/output
++                dest=/tmp/results/repeated_utests/output/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # move the log files
++                source=build/test/logs
++                dest=/tmp/results/repeated_utests/logs/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # maybe stop iterations on test failure
++                if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
++                  break
++                fi
++              done
++          done
++          (exit ${exit_code})
++    - store_test_results:
++        path: /tmp/results/repeated_utests/output
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/stdout
++        destination: stdout
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/output
++        destination: junitxml
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/logs
++        destination: logs
++    environment:
++    - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - LANG: en_US.UTF-8
++    - KEEP_TEST_DIR: true
++    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
++    - PYTHONIOENCODING: utf-8
++    - PYTHONUNBUFFERED: true
++    - CASS_DRIVER_NO_EXTENSIONS: true
++    - CASS_DRIVER_NO_CYTHON: true
++    - CASSANDRA_SKIP_SYNC: true
++    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
++    - DTEST_BRANCH: trunk
++    - CCM_MAX_HEAP_SIZE: 1024M
++    - CCM_HEAP_NEWSIZE: 256M
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++  j8_unit_tests_repeat:
++    docker:
++    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
++    resource_class: medium
++    working_directory: ~/
++    shell: /bin/bash -eo pipefail -l
++    parallelism: 4
++    steps:
++    - attach_workspace:
++        at: /home/cassandra
++    - run:
++        name: Log Environment Information
++        command: |
++          echo '*** id ***'
++          id
++          echo '*** cat /proc/cpuinfo ***'
++          cat /proc/cpuinfo
++          echo '*** free -m ***'
++          free -m
++          echo '*** df -m ***'
++          df -m
++          echo '*** ifconfig -a ***'
++          ifconfig -a
++          echo '*** uname -a ***'
++          uname -a
++          echo '*** mount ***'
++          mount
++          echo '*** env ***'
++          env
++          echo '*** java ***'
++          which java
++          java -version
++    - run:
++        name: Repeatedly run new or modifed JUnit tests
++        no_output_timeout: 15m
++        command: |
++          set -x
++          export PATH=$JAVA_HOME/bin:$PATH
++          time mv ~/cassandra /tmp
++          cd /tmp/cassandra
++          if [ -d ~/dtest_jars ]; then
++            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
++          fi
++
++          # Calculate the number of test iterations to be run by the current parallel runner.
++          count=$((${REPEATED_UTESTS_COUNT} / CIRCLE_NODE_TOTAL))
++          if (($CIRCLE_NODE_INDEX < (${REPEATED_UTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
++            count=$((count+1))
++          fi
++
++          # Put manually specified tests and automatically detected tests together, removing duplicates
++          tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
++          echo "Tests to be repeated: ${tests}"
++
++          # Run each test class as many times as requested.
++          exit_code="$?"
++          for test in $tests; do
++
++              # Split class and method names from the test name
++              if [[ $test =~ "#" ]]; then
++                class=${test%"#"*}
++                method=${test#*"#"}
++              else
++                class=$test
++                method=""
++              fi
++
++              # Prepare the -Dtest.name argument.
++              # It can be the fully qualified class name or the short class name, depending on the target.
++              if [[ $target == "test" || \
++                    $target == "test-cdc" || \
++                    $target == "test-compression" || \
++                    $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
++                    $target == "long-test" || \
++                    $target == "stress-test" ]]; then
++                name_arg="-Dtest.name=${class##*.}"
++              else
++                name_arg="-Dtest.name=$class"
++              fi
++
++              # Prepare the -Dtest.methods argument, which is optional
++              if [ $method == "" ]; then
++                methods_arg=""
++              else
++                methods_arg="-Dtest.methods=$method"
++              fi
++
++              for i in $(seq -w 1 $count); do
++                echo "Running test $test, iteration $i of $count"
++
++                # run the test
++                status="passes"
++                if !( set -o pipefail && \
++                      ant testsome $name_arg $methods_arg -Dno-build-test=true | \
++                      tee stdout.txt \
++                    ); then
++                  status="fails"
++                  exit_code=1
++                fi
++
++                # move the stdout output file
++                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
++                mkdir -p $dest
++                mv stdout.txt $dest/${test}.txt
++
++                # move the XML output files
++                source=build/test/output
++                dest=/tmp/results/repeated_utests/output/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # move the log files
++                source=build/test/logs
++                dest=/tmp/results/repeated_utests/logs/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # maybe stop iterations on test failure
++                if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
++                  break
++                fi
++              done
++          done
++          (exit ${exit_code})
++    - store_test_results:
++        path: /tmp/results/repeated_utests/output
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/stdout
++        destination: stdout
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/output
++        destination: junitxml
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/logs
++        destination: logs
++    environment:
++    - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - LANG: en_US.UTF-8
++    - KEEP_TEST_DIR: true
++    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
++    - PYTHONIOENCODING: utf-8
++    - PYTHONUNBUFFERED: true
++    - CASS_DRIVER_NO_EXTENSIONS: true
++    - CASS_DRIVER_NO_CYTHON: true
++    - CASSANDRA_SKIP_SYNC: true
++    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
++    - DTEST_BRANCH: trunk
++    - CCM_MAX_HEAP_SIZE: 1024M
++    - CCM_HEAP_NEWSIZE: 256M
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++  j8_cqlsh-dtests-py2-no-vnodes:
++    docker:
++    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
++    resource_class: medium
++    working_directory: ~/
++    shell: /bin/bash -eo pipefail -l
++    parallelism: 4
++    steps:
++    - attach_workspace:
++        at: /home/cassandra
++    - run:
++        name: Clone Cassandra dtest Repository (via git)
++        command: |
++          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
++    - run:
++        name: Configure virtualenv and python Dependencies
++        command: |
++          # note, this should be super quick as all dependencies should be pre-installed in the docker image
++          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
++          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
++          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
++          source ~/env3.6/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
++          pip3 uninstall -y cqlsh
++          pip3 freeze
++    - run:
++        name: Determine Tests to Run (j8_without_vnodes)
++        no_output_timeout: 5m
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
++    - run:
++        name: Run dtests (j8_without_vnodes)
++        no_output_timeout: 15m
++        command: |
++          echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
++          cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
++
++          source ~/env3.6/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
++            export CQLSH_PYTHON=/usr/bin/python2.7
++          fi
++
++          java -version
++          cd ~/cassandra-dtest
++          mkdir -p /tmp/dtest
++
++          echo "env: $(env)"
++          echo "** done env"
++          mkdir -p /tmp/results/dtests
++          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
++          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt`
++          set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j8_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++    - store_test_results:
++        path: /tmp/results
++    - store_artifacts:
++        path: /tmp/dtest
++        destination: dtest_j8_without_vnodes
++    - store_artifacts:
++        path: ~/cassandra-dtest/logs
++        destination: dtest_j8_without_vnodes_logs
++    environment:
++    - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - LANG: en_US.UTF-8
++    - KEEP_TEST_DIR: true
++    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
++    - PYTHONIOENCODING: utf-8
++    - PYTHONUNBUFFERED: true
++    - CASS_DRIVER_NO_EXTENSIONS: true
++    - CASS_DRIVER_NO_CYTHON: true
++    - CASSANDRA_SKIP_SYNC: true
++    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
++    - DTEST_BRANCH: trunk
++    - CCM_MAX_HEAP_SIZE: 1024M
++    - CCM_HEAP_NEWSIZE: 256M
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++  j8_upgrade_dtests_repeat:
++    docker:
++    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
++    resource_class: medium
++    working_directory: ~/
++    shell: /bin/bash -eo pipefail -l
++    parallelism: 4
++    steps:
++    - attach_workspace:
++        at: /home/cassandra
++    - run:
++        name: Clone Cassandra dtest Repository (via git)
++        command: |
++          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
++    - run:
++        name: Configure virtualenv and python Dependencies
++        command: |
++          # note, this should be super quick as all dependencies should be pre-installed in the docker image
++          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
++          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
++          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
++          source ~/env3.6/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
++          pip3 uninstall -y cqlsh
++          pip3 freeze
++    - run:
++        name: Run repeated Python dtest
++        no_output_timeout: 15m
++        command: |
++          if [ "${REPEATED_UPGRADE_DTESTS}" == "<nil>" ]; then
++            echo "Repeated dtest name hasn't been defined, exiting without running any test"
++          elif [ "${REPEATED_UPGRADE_DTESTS_COUNT}" == "<nil>" ]; then
++            echo "Repeated dtest count hasn't been defined, exiting without running any test"
++          elif [ "${REPEATED_UPGRADE_DTESTS_COUNT}" -le 0 ]; then
++            echo "Repeated dtest count is lesser or equals than zero, exiting without running any test"
++          else
++
++            # Calculate the number of test iterations to be run by the current parallel runner.
++            # Since we are running the same test multiple times there is no need to use `circleci tests split`.
++            count=$((${REPEATED_UPGRADE_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
++            if (($CIRCLE_NODE_INDEX < (${REPEATED_UPGRADE_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
++              count=$((count+1))
++            fi
++
++            if (($count <= 0)); then
++              echo "No tests to run in this runner"
++            else
++              echo "Running ${REPEATED_UPGRADE_DTESTS} $count times"
++
++              source ~/env3.6/bin/activate
++              export PATH=$JAVA_HOME/bin:$PATH
++
++              java -version
++              cd ~/cassandra-dtest
++              mkdir -p /tmp/dtest
++
++              echo "env: $(env)"
++              echo "** done env"
++              mkdir -p /tmp/results/dtests
++
++              tests_arg=$(echo ${REPEATED_UPGRADE_DTESTS} | sed -e "s/,/ /g")
++
++              stop_on_failure_arg=""
++              if ${REPEATED_TESTS_STOP_ON_FAILURE}; then
++                stop_on_failure_arg="-x"
++              fi
++
++              vnodes_args=""
++              if false; then
++                vnodes_args="--use-vnodes --num-tokens=16"
++              fi
 +
-           java -version
-           cd ~/cassandra-dtest
-           mkdir -p /tmp/dtest
++              upgrade_arg=""
++              if true; then
++                upgrade_arg="--execute-upgrade-tests --upgrade-target-version-only --upgrade-version-selection all"
++              fi
 +
-           echo "env: $(env)"
-           echo "** done env"
-           mkdir -p /tmp/results/dtests
-           # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-           export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt`
-           set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=16 --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j11_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++              # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
++              set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $tests_arg | tee /tmp/dtest/stdout.txt
++            fi
++          fi
 +    - store_test_results:
 +        path: /tmp/results
 +    - store_artifacts:
 +        path: /tmp/dtest
-         destination: dtest_j11_with_vnodes
++        destination: dtest
 +    - store_artifacts:
 +        path: ~/cassandra-dtest/logs
-         destination: dtest_j11_with_vnodes_logs
++        destination: dtest_logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - CASSANDRA_USE_JDK11: true
-   j8_cqlsh-dtests-py3-with-vnodes:
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++  j11_cqlsh-dtests-py2-with-vnodes:
 +    docker:
-     - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
++    - image: apache/cassandra-testing-ubuntu2004-java11:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
 +        command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
-         name: Determine Tests to Run (j8_with_vnodes)
++        name: Determine Tests to Run (j11_with_vnodes)
 +        no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip [...]
 +    - run:
-         name: Run dtests (j8_with_vnodes)
++        name: Run dtests (j11_with_vnodes)
 +        no_output_timeout: 15m
 +        command: |
-           echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
-           cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
++          echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
++          cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
 +
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
-           if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
-             export CQLSH_PYTHON=/usr/bin/python3.6
++          if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
++            export CQLSH_PYTHON=/usr/bin/python2.7
 +          fi
 +
 +          java -version
 +          cd ~/cassandra-dtest
 +          mkdir -p /tmp/dtest
 +
 +          echo "env: $(env)"
 +          echo "** done env"
 +          mkdir -p /tmp/results/dtests
 +          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-           export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt`
-           set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=16 --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j8_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt`
++          set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=16 --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j11_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
 +    - store_test_results:
 +        path: /tmp/results
 +    - store_artifacts:
 +        path: /tmp/dtest
-         destination: dtest_j8_with_vnodes
++        destination: dtest_j11_with_vnodes
 +    - store_artifacts:
 +        path: ~/cassandra-dtest/logs
-         destination: dtest_j8_with_vnodes_logs
++        destination: dtest_j11_with_vnodes_logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j8_cqlsh-dtests-py2-no-vnodes:
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - CASSANDRA_USE_JDK11: true
++  utests_system_keyspace_directory_repeat:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
-         name: Clone Cassandra dtest Repository (via git)
-         command: |
-           git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
-     - run:
-         name: Configure virtualenv and python Dependencies
++        name: Log Environment Information
 +        command: |
-           # note, this should be super quick as all dependencies should be pre-installed in the docker image
-           # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
-           # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
-           # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
-           source ~/env3.6/bin/activate
-           export PATH=$JAVA_HOME/bin:$PATH
-           pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
-           pip3 uninstall -y cqlsh
-           pip3 freeze
-     - run:
-         name: Determine Tests to Run (j8_without_vnodes)
-         no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
++          echo '*** id ***'
++          id
++          echo '*** cat /proc/cpuinfo ***'
++          cat /proc/cpuinfo
++          echo '*** free -m ***'
++          free -m
++          echo '*** df -m ***'
++          df -m
++          echo '*** ifconfig -a ***'
++          ifconfig -a
++          echo '*** uname -a ***'
++          uname -a
++          echo '*** mount ***'
++          mount
++          echo '*** env ***'
++          env
++          echo '*** java ***'
++          which java
++          java -version
 +    - run:
-         name: Run dtests (j8_without_vnodes)
++        name: Repeatedly run new or modifed JUnit tests
 +        no_output_timeout: 15m
 +        command: |
-           echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
-           cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
- 
-           source ~/env3.6/bin/activate
++          set -x
 +          export PATH=$JAVA_HOME/bin:$PATH
-           if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
-             export CQLSH_PYTHON=/usr/bin/python2.7
++          time mv ~/cassandra /tmp
++          cd /tmp/cassandra
++          if [ -d ~/dtest_jars ]; then
++            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 +          fi
 +
-           java -version
-           cd ~/cassandra-dtest
-           mkdir -p /tmp/dtest
++          # Calculate the number of test iterations to be run by the current parallel runner.
++          count=$((${REPEATED_UTESTS_COUNT} / CIRCLE_NODE_TOTAL))
++          if (($CIRCLE_NODE_INDEX < (${REPEATED_UTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
++            count=$((count+1))
++          fi
 +
-           echo "env: $(env)"
-           echo "** done env"
-           mkdir -p /tmp/results/dtests
-           # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-           export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt`
-           set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j8_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++          # Put manually specified tests and automatically detected tests together, removing duplicates
++          tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
++          echo "Tests to be repeated: ${tests}"
++
++          # Run each test class as many times as requested.
++          exit_code="$?"
++          for test in $tests; do
++
++              # Split class and method names from the test name
++              if [[ $test =~ "#" ]]; then
++                class=${test%"#"*}
++                method=${test#*"#"}
++              else
++                class=$test
++                method=""
++              fi
++
++              # Prepare the -Dtest.name argument.
++              # It can be the fully qualified class name or the short class name, depending on the target.
++              if [[ $target == "test" || \
++                    $target == "test-cdc" || \
++                    $target == "test-compression" || \
++                    $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
++                    $target == "long-test" || \
++                    $target == "stress-test" ]]; then
++                name_arg="-Dtest.name=${class##*.}"
++              else
++                name_arg="-Dtest.name=$class"
++              fi
++
++              # Prepare the -Dtest.methods argument, which is optional
++              if [ $method == "" ]; then
++                methods_arg=""
++              else
++                methods_arg="-Dtest.methods=$method"
++              fi
++
++              for i in $(seq -w 1 $count); do
++                echo "Running test $test, iteration $i of $count"
++
++                # run the test
++                status="passes"
++                if !( set -o pipefail && \
++                      ant test-system-keyspace-directory $name_arg $methods_arg -Dno-build-test=true | \
++                      tee stdout.txt \
++                    ); then
++                  status="fails"
++                  exit_code=1
++                fi
++
++                # move the stdout output file
++                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
++                mkdir -p $dest
++                mv stdout.txt $dest/${test}.txt
++
++                # move the XML output files
++                source=build/test/output
++                dest=/tmp/results/repeated_utests/output/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # move the log files
++                source=build/test/logs
++                dest=/tmp/results/repeated_utests/logs/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # maybe stop iterations on test failure
++                if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
++                  break
++                fi
++              done
++          done
++          (exit ${exit_code})
 +    - store_test_results:
-         path: /tmp/results
++        path: /tmp/results/repeated_utests/output
 +    - store_artifacts:
-         path: /tmp/dtest
-         destination: dtest_j8_without_vnodes
++        path: /tmp/results/repeated_utests/stdout
++        destination: stdout
 +    - store_artifacts:
-         path: ~/cassandra-dtest/logs
-         destination: dtest_j8_without_vnodes_logs
++        path: /tmp/results/repeated_utests/output
++        destination: junitxml
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/logs
++        destination: logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
 +    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j11_repeated_dtest:
++  j11_dtests_repeat:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Log Environment Information
 +        command: |
 +          echo '*** id ***'
 +          id
 +          echo '*** cat /proc/cpuinfo ***'
 +          cat /proc/cpuinfo
 +          echo '*** free -m ***'
 +          free -m
 +          echo '*** df -m ***'
 +          df -m
 +          echo '*** ifconfig -a ***'
 +          ifconfig -a
 +          echo '*** uname -a ***'
 +          uname -a
 +          echo '*** mount ***'
 +          mount
 +          echo '*** env ***'
 +          env
 +          echo '*** java ***'
 +          which java
 +          java -version
 +    - run:
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
 +        command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
 +        name: Run repeated Python dtest
 +        no_output_timeout: 15m
 +        command: |
-           if [ "${REPEATED_DTEST_NAME}" == "<nil>" ]; then
++          if [ "${REPEATED_DTESTS}" == "<nil>" ]; then
 +            echo "Repeated dtest name hasn't been defined, exiting without running any test"
-           elif [ "${REPEATED_DTEST_COUNT}" == "<nil>" ]; then
++          elif [ "${REPEATED_DTESTS_COUNT}" == "<nil>" ]; then
 +            echo "Repeated dtest count hasn't been defined, exiting without running any test"
-           elif [ "${REPEATED_DTEST_COUNT}" -le 0 ]; then
++          elif [ "${REPEATED_DTESTS_COUNT}" -le 0 ]; then
 +            echo "Repeated dtest count is lesser or equals than zero, exiting without running any test"
 +          else
 +
 +            # Calculate the number of test iterations to be run by the current parallel runner.
 +            # Since we are running the same test multiple times there is no need to use `circleci tests split`.
-             count=$((${REPEATED_DTEST_COUNT} / CIRCLE_NODE_TOTAL))
-             if (($CIRCLE_NODE_INDEX < (${REPEATED_DTEST_COUNT} % CIRCLE_NODE_TOTAL))); then
++            count=$((${REPEATED_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
++            if (($CIRCLE_NODE_INDEX < (${REPEATED_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
 +              count=$((count+1))
 +            fi
 +
 +            if (($count <= 0)); then
 +              echo "No tests to run in this runner"
 +            else
-               echo "Running ${REPEATED_DTEST_NAME} $count times"
++              echo "Running ${REPEATED_DTESTS} $count times"
 +
 +              source ~/env3.6/bin/activate
 +              export PATH=$JAVA_HOME/bin:$PATH
 +
 +              java -version
 +              cd ~/cassandra-dtest
 +              mkdir -p /tmp/dtest
 +
 +              echo "env: $(env)"
 +              echo "** done env"
 +              mkdir -p /tmp/results/dtests
 +
++              tests_arg=$(echo ${REPEATED_DTESTS} | sed -e "s/,/ /g")
++
 +              stop_on_failure_arg=""
-               if ${REPEATED_DTEST_STOP_ON_FAILURE}; then
++              if ${REPEATED_TESTS_STOP_ON_FAILURE}; then
                  stop_on_failure_arg="-x"
                fi
  
 -              vnodes_args=""
 -              if true; then
 -                vnodes_args="--use-vnodes --num-tokens=16"
 +              vnodes_args=""
-               if ${REPEATED_DTEST_VNODES}; then
++              if false; then
 +                vnodes_args="--use-vnodes --num-tokens=16"
 +              fi
 +
 +              upgrade_arg=""
 +              if false; then
-                 upgrade_arg="--execute-upgrade-tests"
++                upgrade_arg="--execute-upgrade-tests --upgrade-target-version-only --upgrade-version-selection all"
 +              fi
 +
 +              # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-               set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir ${REPEATED_DTEST_NAME} | tee /tmp/dtest/stdout.txt
++              set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $tests_arg | tee /tmp/dtest/stdout.txt
 +            fi
 +          fi
 +    - store_test_results:
 +        path: /tmp/results
 +    - store_artifacts:
 +        path: /tmp/dtest
 +        destination: dtest
 +    - store_artifacts:
 +        path: ~/cassandra-dtest/logs
 +        destination: dtest_logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - CASSANDRA_USE_JDK11: true
-   j8_repeated_dtest:
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - CASSANDRA_USE_JDK11: true
++  j8_cqlsh_dtests_py38:
++    docker:
++    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
++    resource_class: medium
++    working_directory: ~/
++    shell: /bin/bash -eo pipefail -l
++    parallelism: 4
++    steps:
++    - attach_workspace:
++        at: /home/cassandra
++    - run:
++        name: Clone Cassandra dtest Repository (via git)
++        command: |
++          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
++    - run:
++        name: Configure virtualenv and python Dependencies
++        command: |
++          # note, this should be super quick as all dependencies should be pre-installed in the docker image
++          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
++          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
++          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
++          source ~/env3.8/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
++          pip3 uninstall -y cqlsh
++          pip3 freeze
++    - run:
++        name: Determine Tests to Run (j8_without_vnodes)
++        no_output_timeout: 5m
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
++    - run:
++        name: Run dtests (j8_without_vnodes)
++        no_output_timeout: 15m
++        command: |
++          echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
++          cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
++
++          source ~/env3.8/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
++            export CQLSH_PYTHON=/usr/bin/python3.8
++          fi
++
++          java -version
++          cd ~/cassandra-dtest
++          mkdir -p /tmp/dtest
++
++          echo "env: $(env)"
++          echo "** done env"
++          mkdir -p /tmp/results/dtests
++          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
++          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt`
++          set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j8_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++    - store_test_results:
++        path: /tmp/results
++    - store_artifacts:
++        path: /tmp/dtest
++        destination: dtest_j8_without_vnodes
++    - store_artifacts:
++        path: ~/cassandra-dtest/logs
++        destination: dtest_j8_without_vnodes_logs
++    environment:
++    - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - LANG: en_US.UTF-8
++    - KEEP_TEST_DIR: true
++    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
++    - PYTHONIOENCODING: utf-8
++    - PYTHONUNBUFFERED: true
++    - CASS_DRIVER_NO_EXTENSIONS: true
++    - CASS_DRIVER_NO_CYTHON: true
++    - CASSANDRA_SKIP_SYNC: true
++    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
++    - DTEST_BRANCH: trunk
++    - CCM_MAX_HEAP_SIZE: 1024M
++    - CCM_HEAP_NEWSIZE: 256M
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++  j8_dtests_vnode_repeat:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
 +        command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
 +        name: Run repeated Python dtest
 +        no_output_timeout: 15m
 +        command: |
-           if [ "${REPEATED_DTEST_NAME}" == "<nil>" ]; then
++          if [ "${REPEATED_DTESTS}" == "<nil>" ]; then
 +            echo "Repeated dtest name hasn't been defined, exiting without running any test"
-           elif [ "${REPEATED_DTEST_COUNT}" == "<nil>" ]; then
++          elif [ "${REPEATED_DTESTS_COUNT}" == "<nil>" ]; then
 +            echo "Repeated dtest count hasn't been defined, exiting without running any test"
-           elif [ "${REPEATED_DTEST_COUNT}" -le 0 ]; then
++          elif [ "${REPEATED_DTESTS_COUNT}" -le 0 ]; then
 +            echo "Repeated dtest count is lesser or equals than zero, exiting without running any test"
 +          else
 +
 +            # Calculate the number of test iterations to be run by the current parallel runner.
 +            # Since we are running the same test multiple times there is no need to use `circleci tests split`.
-             count=$((${REPEATED_DTEST_COUNT} / CIRCLE_NODE_TOTAL))
-             if (($CIRCLE_NODE_INDEX < (${REPEATED_DTEST_COUNT} % CIRCLE_NODE_TOTAL))); then
++            count=$((${REPEATED_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
++            if (($CIRCLE_NODE_INDEX < (${REPEATED_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
 +              count=$((count+1))
 +            fi
 +
 +            if (($count <= 0)); then
 +              echo "No tests to run in this runner"
 +            else
-               echo "Running ${REPEATED_DTEST_NAME} $count times"
++              echo "Running ${REPEATED_DTESTS} $count times"
 +
 +              source ~/env3.6/bin/activate
 +              export PATH=$JAVA_HOME/bin:$PATH
 +
 +              java -version
 +              cd ~/cassandra-dtest
 +              mkdir -p /tmp/dtest
 +
 +              echo "env: $(env)"
 +              echo "** done env"
 +              mkdir -p /tmp/results/dtests
 +
++              tests_arg=$(echo ${REPEATED_DTESTS} | sed -e "s/,/ /g")
++
 +              stop_on_failure_arg=""
-               if ${REPEATED_DTEST_STOP_ON_FAILURE}; then
++              if ${REPEATED_TESTS_STOP_ON_FAILURE}; then
 +                stop_on_failure_arg="-x"
 +              fi
 +
 +              vnodes_args=""
-               if ${REPEATED_DTEST_VNODES}; then
++              if true; then
 +                vnodes_args="--use-vnodes --num-tokens=16"
 +              fi
 +
 +              upgrade_arg=""
 +              if false; then
-                 upgrade_arg="--execute-upgrade-tests"
++                upgrade_arg="--execute-upgrade-tests --upgrade-target-version-only --upgrade-version-selection all"
 +              fi
 +
 +              # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-               set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir ${REPEATED_DTEST_NAME} | tee /tmp/dtest/stdout.txt
++              set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $tests_arg | tee /tmp/dtest/stdout.txt
 +            fi
 +          fi
 +    - store_test_results:
 +        path: /tmp/results
 +    - store_artifacts:
 +        path: /tmp/dtest
 +        destination: dtest
 +    - store_artifacts:
 +        path: ~/cassandra-dtest/logs
 +        destination: dtest_logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
 +    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j11_cqlsh-dtests-py2-with-vnodes:
++  j11_cqlsh_dtests_py3_vnode:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
 +        command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
 +        name: Determine Tests to Run (j11_with_vnodes)
 +        no_output_timeout: 5m
 +        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip [...]
 +    - run:
 +        name: Run dtests (j11_with_vnodes)
 +        no_output_timeout: 15m
 +        command: |
 +          echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
 +          cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
 +
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
-           if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
-             export CQLSH_PYTHON=/usr/bin/python2.7
++          if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
++            export CQLSH_PYTHON=/usr/bin/python3.6
 +          fi
 +
 +          java -version
 +          cd ~/cassandra-dtest
 +          mkdir -p /tmp/dtest
 +
 +          echo "env: $(env)"
 +          echo "** done env"
 +          mkdir -p /tmp/results/dtests
 +          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
 +          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt`
 +          set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=16 --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j11_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
 +    - store_test_results:
 +        path: /tmp/results
 +    - store_artifacts:
 +        path: /tmp/dtest
 +        destination: dtest_j11_with_vnodes
 +    - store_artifacts:
 +        path: ~/cassandra-dtest/logs
 +        destination: dtest_j11_with_vnodes_logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
 +    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - CASSANDRA_USE_JDK11: true
-   j11_dtests-with-vnodes:
++  utests_fqltool_repeat:
 +    docker:
-     - image: apache/cassandra-testing-ubuntu2004-java11:latest
++    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Log Environment Information
 +        command: |
 +          echo '*** id ***'
 +          id
 +          echo '*** cat /proc/cpuinfo ***'
 +          cat /proc/cpuinfo
 +          echo '*** free -m ***'
 +          free -m
 +          echo '*** df -m ***'
 +          df -m
 +          echo '*** ifconfig -a ***'
 +          ifconfig -a
 +          echo '*** uname -a ***'
 +          uname -a
 +          echo '*** mount ***'
 +          mount
 +          echo '*** env ***'
 +          env
 +          echo '*** java ***'
 +          which java
 +          java -version
++    - run:
++        name: Repeatedly run new or modifed JUnit tests
++        no_output_timeout: 15m
++        command: |
++          set -x
++          export PATH=$JAVA_HOME/bin:$PATH
++          time mv ~/cassandra /tmp
++          cd /tmp/cassandra
++          if [ -d ~/dtest_jars ]; then
++            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
++          fi
++
++          # Calculate the number of test iterations to be run by the current parallel runner.
++          count=$((${REPEATED_UTESTS_FQLTOOL_COUNT} / CIRCLE_NODE_TOTAL))
++          if (($CIRCLE_NODE_INDEX < (${REPEATED_UTESTS_FQLTOOL_COUNT} % CIRCLE_NODE_TOTAL))); then
++            count=$((count+1))
++          fi
++
++          # Put manually specified tests and automatically detected tests together, removing duplicates
++          tests=$(echo ${REPEATED_UTESTS_FQLTOOL} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
++          echo "Tests to be repeated: ${tests}"
++
++          # Run each test class as many times as requested.
++          exit_code="$?"
++          for test in $tests; do
++
++              # Split class and method names from the test name
++              if [[ $test =~ "#" ]]; then
++                class=${test%"#"*}
++                method=${test#*"#"}
++              else
++                class=$test
++                method=""
++              fi
++
++              # Prepare the -Dtest.name argument.
++              # It can be the fully qualified class name or the short class name, depending on the target.
++              if [[ $target == "test" || \
++                    $target == "test-cdc" || \
++                    $target == "test-compression" || \
++                    $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
++                    $target == "long-test" || \
++                    $target == "stress-test" ]]; then
++                name_arg="-Dtest.name=${class##*.}"
++              else
++                name_arg="-Dtest.name=$class"
++              fi
++
++              # Prepare the -Dtest.methods argument, which is optional
++              if [ $method == "" ]; then
++                methods_arg=""
++              else
++                methods_arg="-Dtest.methods=$method"
++              fi
++
++              for i in $(seq -w 1 $count); do
++                echo "Running test $test, iteration $i of $count"
++
++                # run the test
++                status="passes"
++                if !( set -o pipefail && \
++                      ant fqltool-test $name_arg $methods_arg -Dno-build-test=true | \
++                      tee stdout.txt \
++                    ); then
++                  status="fails"
++                  exit_code=1
++                fi
++
++                # move the stdout output file
++                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
++                mkdir -p $dest
++                mv stdout.txt $dest/${test}.txt
++
++                # move the XML output files
++                source=build/test/output
++                dest=/tmp/results/repeated_utests/output/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # move the log files
++                source=build/test/logs
++                dest=/tmp/results/repeated_utests/logs/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # maybe stop iterations on test failure
++                if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
++                  break
++                fi
++              done
++          done
++          (exit ${exit_code})
++    - store_test_results:
++        path: /tmp/results/repeated_utests/output
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/stdout
++        destination: stdout
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/output
++        destination: junitxml
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/logs
++        destination: logs
++    environment:
++    - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - LANG: en_US.UTF-8
++    - KEEP_TEST_DIR: true
++    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
++    - PYTHONIOENCODING: utf-8
++    - PYTHONUNBUFFERED: true
++    - CASS_DRIVER_NO_EXTENSIONS: true
++    - CASS_DRIVER_NO_CYTHON: true
++    - CASSANDRA_SKIP_SYNC: true
++    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
++    - DTEST_BRANCH: trunk
++    - CCM_MAX_HEAP_SIZE: 1024M
++    - CCM_HEAP_NEWSIZE: 256M
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++  j8_upgrade_dtests:
++    docker:
++    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
++    resource_class: medium
++    working_directory: ~/
++    shell: /bin/bash -eo pipefail -l
++    parallelism: 4
++    steps:
++    - attach_workspace:
++        at: /home/cassandra
 +    - run:
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
 +        command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
-         name: Determine Tests to Run (j11_with_vnodes)
++        name: Determine Tests to Run (j8_upgradetests_without_vnodes)
 +        no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip [...]
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_upgradetests_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --ex [...]
 +    - run:
-         name: Run dtests (j11_with_vnodes)
++        name: Run dtests (j8_upgradetests_without_vnodes)
 +        no_output_timeout: 15m
-         command: "echo \"cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n  export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the [...]
++        command: "echo \"cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n  export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually  [...]
 +    - store_test_results:
 +        path: /tmp/results
 +    - store_artifacts:
 +        path: /tmp/dtest
-         destination: dtest_j11_with_vnodes
++        destination: dtest_j8_upgradetests_without_vnodes
 +    - store_artifacts:
 +        path: ~/cassandra-dtest/logs
-         destination: dtest_j11_with_vnodes_logs
++        destination: dtest_j8_upgradetests_without_vnodes_logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - CASSANDRA_USE_JDK11: true
-   j8_dtests-no-vnodes:
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++  j8_jvm_upgrade_dtests_repeat:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
++    - attach_workspace:
++        at: /home/cassandra
++    - run:
++        name: Log Environment Information
++        command: |
++          echo '*** id ***'
++          id
++          echo '*** cat /proc/cpuinfo ***'
++          cat /proc/cpuinfo
++          echo '*** free -m ***'
++          free -m
++          echo '*** df -m ***'
++          df -m
++          echo '*** ifconfig -a ***'
++          ifconfig -a
++          echo '*** uname -a ***'
++          uname -a
++          echo '*** mount ***'
++          mount
++          echo '*** env ***'
++          env
++          echo '*** java ***'
++          which java
++          java -version
++    - run:
++        name: Repeatedly run new or modifed JUnit tests
++        no_output_timeout: 15m
++        command: |
++          set -x
++          export PATH=$JAVA_HOME/bin:$PATH
++          time mv ~/cassandra /tmp
++          cd /tmp/cassandra
++          if [ -d ~/dtest_jars ]; then
++            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
++          fi
++
++          # Calculate the number of test iterations to be run by the current parallel runner.
++          count=$((${REPEATED_JVM_UPGRADE_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
++          if (($CIRCLE_NODE_INDEX < (${REPEATED_JVM_UPGRADE_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
++            count=$((count+1))
++          fi
++
++          # Put manually specified tests and automatically detected tests together, removing duplicates
++          tests=$(echo ${REPEATED_JVM_UPGRADE_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
++          echo "Tests to be repeated: ${tests}"
++
++          # Run each test class as many times as requested.
++          exit_code="$?"
++          for test in $tests; do
++
++              # Split class and method names from the test name
++              if [[ $test =~ "#" ]]; then
++                class=${test%"#"*}
++                method=${test#*"#"}
++              else
++                class=$test
++                method=""
++              fi
++
++              # Prepare the -Dtest.name argument.
++              # It can be the fully qualified class name or the short class name, depending on the target.
++              if [[ $target == "test" || \
++                    $target == "test-cdc" || \
++                    $target == "test-compression" || \
++                    $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
++                    $target == "long-test" || \
++                    $target == "stress-test" ]]; then
++                name_arg="-Dtest.name=${class##*.}"
++              else
++                name_arg="-Dtest.name=$class"
++              fi
++
++              # Prepare the -Dtest.methods argument, which is optional
++              if [ $method == "" ]; then
++                methods_arg=""
++              else
++                methods_arg="-Dtest.methods=$method"
++              fi
++
++              for i in $(seq -w 1 $count); do
++                echo "Running test $test, iteration $i of $count"
++
++                # run the test
++                status="passes"
++                if !( set -o pipefail && \
++                      ant test-jvm-dtest-some $name_arg $methods_arg -Dno-build-test=true | \
++                      tee stdout.txt \
++                    ); then
++                  status="fails"
++                  exit_code=1
++                fi
++
++                # move the stdout output file
++                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
++                mkdir -p $dest
++                mv stdout.txt $dest/${test}.txt
++
++                # move the XML output files
++                source=build/test/output
++                dest=/tmp/results/repeated_utests/output/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # move the log files
++                source=build/test/logs
++                dest=/tmp/results/repeated_utests/logs/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # maybe stop iterations on test failure
++                if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
++                  break
++                fi
++              done
++          done
++          (exit ${exit_code})
++    - store_test_results:
++        path: /tmp/results/repeated_utests/output
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/stdout
++        destination: stdout
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/output
++        destination: junitxml
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/logs
++        destination: logs
++    environment:
++    - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - LANG: en_US.UTF-8
++    - KEEP_TEST_DIR: true
++    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
++    - PYTHONIOENCODING: utf-8
++    - PYTHONUNBUFFERED: true
++    - CASS_DRIVER_NO_EXTENSIONS: true
++    - CASS_DRIVER_NO_CYTHON: true
++    - CASSANDRA_SKIP_SYNC: true
++    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
++    - DTEST_BRANCH: trunk
++    - CCM_MAX_HEAP_SIZE: 1024M
++    - CCM_HEAP_NEWSIZE: 256M
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++  j11_cqlsh_dtests_py38_vnode:
++    docker:
++    - image: apache/cassandra-testing-ubuntu2004-java11:latest
++    resource_class: medium
++    working_directory: ~/
++    shell: /bin/bash -eo pipefail -l
++    parallelism: 4
++    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
 +        command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
-           source ~/env3.6/bin/activate
++          source ~/env3.8/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
-         name: Determine Tests to Run (j8_without_vnodes)
++        name: Determine Tests to Run (j11_with_vnodes)
 +        no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip [...]
 +    - run:
-         name: Run dtests (j8_without_vnodes)
++        name: Run dtests (j11_with_vnodes)
 +        no_output_timeout: 15m
-         command: "echo \"cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n  export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not [...]
++        command: |
++          echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
++          cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
++
++          source ~/env3.8/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
++            export CQLSH_PYTHON=/usr/bin/python3.8
++          fi
++
++          java -version
++          cd ~/cassandra-dtest
++          mkdir -p /tmp/dtest
++
++          echo "env: $(env)"
++          echo "** done env"
++          mkdir -p /tmp/results/dtests
++          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
++          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt`
++          set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=16 --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j11_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
 +    - store_test_results:
 +        path: /tmp/results
 +    - store_artifacts:
 +        path: /tmp/dtest
-         destination: dtest_j8_without_vnodes
++        destination: dtest_j11_with_vnodes
 +    - store_artifacts:
 +        path: ~/cassandra-dtest/logs
-         destination: dtest_j8_without_vnodes_logs
++        destination: dtest_j11_with_vnodes_logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j8_upgradetests-no-vnodes:
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - CASSANDRA_USE_JDK11: true
++  j11_jvm_dtests_repeat:
 +    docker:
-     - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
++    - image: apache/cassandra-testing-ubuntu2004-java11:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
-         name: Clone Cassandra dtest Repository (via git)
++        name: Log Environment Information
 +        command: |
-           git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
++          echo '*** id ***'
++          id
++          echo '*** cat /proc/cpuinfo ***'
++          cat /proc/cpuinfo
++          echo '*** free -m ***'
++          free -m
++          echo '*** df -m ***'
++          df -m
++          echo '*** ifconfig -a ***'
++          ifconfig -a
++          echo '*** uname -a ***'
++          uname -a
++          echo '*** mount ***'
++          mount
++          echo '*** env ***'
++          env
++          echo '*** java ***'
++          which java
++          java -version
 +    - run:
-         name: Configure virtualenv and python Dependencies
++        name: Repeatedly run new or modifed JUnit tests
++        no_output_timeout: 15m
 +        command: |
-           # note, this should be super quick as all dependencies should be pre-installed in the docker image
-           # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
-           # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
-           # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
-           source ~/env3.6/bin/activate
++          set -x
 +          export PATH=$JAVA_HOME/bin:$PATH
-           pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
-           pip3 uninstall -y cqlsh
-           pip3 freeze
-     - run:
-         name: Determine Tests to Run (j8_upgradetests_without_vnodes)
-         no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_upgradetests_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --ex [...]
-     - run:
-         name: Run dtests (j8_upgradetests_without_vnodes)
-         no_output_timeout: 15m
-         command: "echo \"cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n  export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually  [...]
++          time mv ~/cassandra /tmp
++          cd /tmp/cassandra
++          if [ -d ~/dtest_jars ]; then
++            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
++          fi
++
++          # Calculate the number of test iterations to be run by the current parallel runner.
++          count=$((${REPEATED_JVM_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
++          if (($CIRCLE_NODE_INDEX < (${REPEATED_JVM_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
++            count=$((count+1))
++          fi
++
++          # Put manually specified tests and automatically detected tests together, removing duplicates
++          tests=$(echo ${REPEATED_JVM_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
++          echo "Tests to be repeated: ${tests}"
++
++          # Run each test class as many times as requested.
++          exit_code="$?"
++          for test in $tests; do
++
++              # Split class and method names from the test name
++              if [[ $test =~ "#" ]]; then
++                class=${test%"#"*}
++                method=${test#*"#"}
++              else
++                class=$test
++                method=""
++              fi
++
++              # Prepare the -Dtest.name argument.
++              # It can be the fully qualified class name or the short class name, depending on the target.
++              if [[ $target == "test" || \
++                    $target == "test-cdc" || \
++                    $target == "test-compression" || \
++                    $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
++                    $target == "long-test" || \
++                    $target == "stress-test" ]]; then
++                name_arg="-Dtest.name=${class##*.}"
++              else
++                name_arg="-Dtest.name=$class"
++              fi
++
++              # Prepare the -Dtest.methods argument, which is optional
++              if [ $method == "" ]; then
++                methods_arg=""
++              else
++                methods_arg="-Dtest.methods=$method"
++              fi
++
++              for i in $(seq -w 1 $count); do
++                echo "Running test $test, iteration $i of $count"
++
++                # run the test
++                status="passes"
++                if !( set -o pipefail && \
++                      ant test-jvm-dtest-some $name_arg $methods_arg -Dno-build-test=true | \
++                      tee stdout.txt \
++                    ); then
++                  status="fails"
++                  exit_code=1
++                fi
++
++                # move the stdout output file
++                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
++                mkdir -p $dest
++                mv stdout.txt $dest/${test}.txt
++
++                # move the XML output files
++                source=build/test/output
++                dest=/tmp/results/repeated_utests/output/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # move the log files
++                source=build/test/logs
++                dest=/tmp/results/repeated_utests/logs/${status}/${i}
++                mkdir -p $dest
++                if [[ -d $source && -n "$(ls $source)" ]]; then
++                  mv $source/* $dest/
++                fi
++
++                # maybe stop iterations on test failure
++                if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
++                  break
++                fi
++              done
++          done
++          (exit ${exit_code})
 +    - store_test_results:
-         path: /tmp/results
++        path: /tmp/results/repeated_utests/output
 +    - store_artifacts:
-         path: /tmp/dtest
-         destination: dtest_j8_upgradetests_without_vnodes
++        path: /tmp/results/repeated_utests/stdout
++        destination: stdout
 +    - store_artifacts:
-         path: ~/cassandra-dtest/logs
-         destination: dtest_j8_upgradetests_without_vnodes_logs
++        path: /tmp/results/repeated_utests/output
++        destination: junitxml
++    - store_artifacts:
++        path: /tmp/results/repeated_utests/logs
++        destination: logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - CASSANDRA_USE_JDK11: true
 +  utests_stress:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 1
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Run Unit Tests (stress-test)
 +        command: |
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          time mv ~/cassandra /tmp
 +          cd /tmp/cassandra
 +          if [ -d ~/dtest_jars ]; then
 +            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 +          fi
 +          ant stress-test
 +        no_output_timeout: 15m
 +    - store_test_results:
 +        path: /tmp/cassandra/build/test/output/
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/output
 +        destination: junitxml
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/logs
 +        destination: logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
 +    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +  j8_unit_tests:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Determine unit Tests to Run
 +        command: |
 +          # reminder: this code (along with all the steps) is independently executed on every circle container
 +          # so the goal here is to get the circleci script to return the tests *this* container will run
 +          # which we do via the `circleci` cli tool.
 +
 +          rm -fr ~/cassandra-dtest/upgrade_tests
 +          echo "***java tests***"
 +
 +          # get all of our unit test filenames
 +          set -eo pipefail && circleci tests glob "$HOME/cassandra/test/unit/**/*.java" > /tmp/all_java_unit_tests.txt
 +
 +          # split up the unit tests into groups based on the number of containers we have
 +          set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
 +          set -eo pipefail && cat /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt | sed "s;^/home/cassandra/cassandra/test/unit/;;g" | grep "Test\.java$"  > /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
 +          echo "** /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt"
 +          cat /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
 +        no_output_timeout: 15m
 +    - run:
 +        name: Log Environment Information
 +        command: |
 +          echo '*** id ***'
 +          id
 +          echo '*** cat /proc/cpuinfo ***'
 +          cat /proc/cpuinfo
 +          echo '*** free -m ***'
 +          free -m
 +          echo '*** df -m ***'
 +          df -m
 +          echo '*** ifconfig -a ***'
 +          ifconfig -a
 +          echo '*** uname -a ***'
 +          uname -a
 +          echo '*** mount ***'
 +          mount
 +          echo '*** env ***'
 +          env
 +          echo '*** java ***'
 +          which java
 +          java -version
 +    - run:
 +        name: Run Unit Tests (testclasslist)
 +        command: |
 +          set -x
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          time mv ~/cassandra /tmp
 +          cd /tmp/cassandra
 +          if [ -d ~/dtest_jars ]; then
 +            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 +          fi
 +          test_timeout=$(grep 'name="test.unit.timeout"' build.xml | awk -F'"' '{print $4}' || true)
 +          if [ -z "$test_timeout" ]; then
 +            test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"' '{print $4}')
 +          fi
 +          ant testclasslist -Dtest.timeout="$test_timeout" -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt  -Dtest.classlistprefix=unit
 +        no_output_timeout: 15m
 +    - store_test_results:
 +        path: /tmp/cassandra/build/test/output/
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/output
 +        destination: junitxml
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/logs
 +        destination: logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
 +    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +  j11_jvm_dtests:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 1
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Determine distributed Tests to Run
 +        command: |
 +          # reminder: this code (along with all the steps) is independently executed on every circle container
 +          # so the goal here is to get the circleci script to return the tests *this* container will run
 +          # which we do via the `circleci` cli tool.
 +
 +          rm -fr ~/cassandra-dtest/upgrade_tests
 +          echo "***java tests***"
 +
 +          # get all of our unit test filenames
 +          set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
 +
 +          # split up the unit tests into groups based on the number of containers we have
 +          set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
 +          set -eo pipefail && cat /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt | sed "s;^/home/cassandra/cassandra/test/distributed/;;g" | grep "Test\.java$" | grep -v upgrade > /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
 +          echo "** /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt"
 +          cat /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt
 +        no_output_timeout: 15m
 +    - run:
 +        name: Log Environment Information
 +        command: |
 +          echo '*** id ***'
 +          id
 +          echo '*** cat /proc/cpuinfo ***'
 +          cat /proc/cpuinfo
 +          echo '*** free -m ***'
 +          free -m
 +          echo '*** df -m ***'
 +          df -m
 +          echo '*** ifconfig -a ***'
 +          ifconfig -a
 +          echo '*** uname -a ***'
 +          uname -a
 +          echo '*** mount ***'
 +          mount
 +          echo '*** env ***'
 +          env
 +          echo '*** java ***'
 +          which java
 +          java -version
 +    - run:
 +        name: Run Unit Tests (testclasslist)
 +        command: |
 +          set -x
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          time mv ~/cassandra /tmp
 +          cd /tmp/cassandra
 +          if [ -d ~/dtest_jars ]; then
 +            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 +          fi
 +          test_timeout=$(grep 'name="test.distributed.timeout"' build.xml | awk -F'"' '{print $4}' || true)
 +          if [ -z "$test_timeout" ]; then
 +            test_timeout=$(grep 'name="test.timeout"' build.xml | awk -F'"' '{print $4}')
 +          fi
 +          ant testclasslist -Dtest.timeout="$test_timeout" -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt  -Dtest.classlistprefix=distributed
 +        no_output_timeout: 15m
 +    - store_test_results:
 +        path: /tmp/cassandra/build/test/output/
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/output
 +        destination: junitxml
 +    - store_artifacts:
 +        path: /tmp/cassandra/build/test/logs
 +        destination: logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
 +    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - CASSANDRA_USE_JDK11: true
 +  j11_build:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 1
 +    steps:
 +    - run:
 +        name: Log Environment Information
 +        command: |
 +          echo '*** id ***'
 +          id
 +          echo '*** cat /proc/cpuinfo ***'
 +          cat /proc/cpuinfo
 +          echo '*** free -m ***'
 +          free -m
 +          echo '*** df -m ***'
 +          df -m
 +          echo '*** ifconfig -a ***'
 +          ifconfig -a
 +          echo '*** uname -a ***'
 +          uname -a
 +          echo '*** mount ***'
 +          mount
 +          echo '*** env ***'
 +          env
 +          echo '*** java ***'
 +          which java
 +          java -version
 +    - run:
 +        name: Clone Cassandra Repository (via git)
 +        command: |
 +          git clone --single-branch --depth 1 --branch $CIRCLE_BRANCH https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git ~/cassandra
 +    - run:
 +        name: Build Cassandra
 +        command: |
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          cd ~/cassandra
 +          # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
 +          for x in $(seq 1 3); do
 +              ${ANT_HOME}/bin/ant clean realclean jar
 +              RETURN="$?"
 +              if [ "${RETURN}" -eq "0" ]; then
 +                  break
 +              fi
 +          done
 +          # Exit, if we didn't build successfully
 +          if [ "${RETURN}" -ne "0" ]; then
 +              echo "Build failed with exit code: ${RETURN}"
 +              exit ${RETURN}
 +          fi
 +        no_output_timeout: 15m
 +    - run:
 +        name: Run eclipse-warnings
 +        command: |
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          cd ~/cassandra
 +          ant eclipse-warnings
 +    - persist_to_workspace:
 +        root: /home/cassandra
 +        paths:
 +        - cassandra
 +        - .m2
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - CASSANDRA_USE_JDK11: true
++  j8_dtests:
++    docker:
++    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
++    resource_class: medium
++    working_directory: ~/
++    shell: /bin/bash -eo pipefail -l
++    parallelism: 4
++    steps:
++    - attach_workspace:
++        at: /home/cassandra
++    - run:
++        name: Clone Cassandra dtest Repository (via git)
++        command: |
++          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
++    - run:
++        name: Configure virtualenv and python Dependencies
++        command: |
++          # note, this should be super quick as all dependencies should be pre-installed in the docker image
++          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
++          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
++          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
++          source ~/env3.6/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
++          pip3 uninstall -y cqlsh
++          pip3 freeze
++    - run:
++        name: Determine Tests to Run (j8_without_vnodes)
++        no_output_timeout: 5m
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
++    - run:
++        name: Run dtests (j8_without_vnodes)
++        no_output_timeout: 15m
++        command: "echo \"cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n  export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not [...]
++    - store_test_results:
++        path: /tmp/results
++    - store_artifacts:
++        path: /tmp/dtest
++        destination: dtest_j8_without_vnodes
++    - store_artifacts:
++        path: ~/cassandra-dtest/logs
++        destination: dtest_j8_without_vnodes_logs
++    environment:
++    - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - LANG: en_US.UTF-8
++    - KEEP_TEST_DIR: true
++    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
++    - PYTHONIOENCODING: utf-8
++    - PYTHONUNBUFFERED: true
++    - CASS_DRIVER_NO_EXTENSIONS: true
++    - CASS_DRIVER_NO_CYTHON: true
++    - CASSANDRA_SKIP_SYNC: true
++    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
++    - DTEST_BRANCH: trunk
++    - CCM_MAX_HEAP_SIZE: 1024M
++    - CCM_HEAP_NEWSIZE: 256M
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++  j11_cqlsh-dtests-py2-no-vnodes:
++    docker:
++    - image: apache/cassandra-testing-ubuntu2004-java11:latest
++    resource_class: medium
++    working_directory: ~/
++    shell: /bin/bash -eo pipefail -l
++    parallelism: 4
++    steps:
++    - attach_workspace:
++        at: /home/cassandra
++    - run:
++        name: Clone Cassandra dtest Repository (via git)
++        command: |
++          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
++    - run:
++        name: Configure virtualenv and python Dependencies
++        command: |
++          # note, this should be super quick as all dependencies should be pre-installed in the docker image
++          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
++          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
++          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
++          source ~/env3.6/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
++          pip3 uninstall -y cqlsh
++          pip3 freeze
++    - run:
++        name: Determine Tests to Run (j11_without_vnodes)
++        no_output_timeout: 5m
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource- [...]
++    - run:
++        name: Run dtests (j11_without_vnodes)
++        no_output_timeout: 15m
++        command: |
++          echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
++          cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
++
++          source ~/env3.6/bin/activate
++          export PATH=$JAVA_HOME/bin:$PATH
++          if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
++            export CQLSH_PYTHON=/usr/bin/python2.7
++          fi
++
++          java -version
++          cd ~/cassandra-dtest
++          mkdir -p /tmp/dtest
++
++          echo "env: $(env)"
++          echo "** done env"
++          mkdir -p /tmp/results/dtests
++          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
++          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt`
++          set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j11_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++    - store_test_results:
++        path: /tmp/results
++    - store_artifacts:
++        path: /tmp/dtest
++        destination: dtest_j11_without_vnodes
++    - store_artifacts:
++        path: ~/cassandra-dtest/logs
++        destination: dtest_j11_without_vnodes_logs
++    environment:
++    - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - LANG: en_US.UTF-8
++    - KEEP_TEST_DIR: true
++    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
++    - PYTHONIOENCODING: utf-8
++    - PYTHONUNBUFFERED: true
++    - CASS_DRIVER_NO_EXTENSIONS: true
++    - CASS_DRIVER_NO_CYTHON: true
++    - CASSANDRA_SKIP_SYNC: true
++    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
++    - DTEST_BRANCH: trunk
++    - CCM_MAX_HEAP_SIZE: 1024M
++    - CCM_HEAP_NEWSIZE: 256M
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
 +    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - CASSANDRA_USE_JDK11: true
-   j11_cqlsh-dtests-py2-no-vnodes:
++  j8_dtests_vnode:
 +    docker:
-     - image: apache/cassandra-testing-ubuntu2004-java11:latest
++    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
 +        command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
-         name: Determine Tests to Run (j11_without_vnodes)
++        name: Determine Tests to Run (j8_with_vnodes)
 +        no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource- [...]
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
 +    - run:
-         name: Run dtests (j11_without_vnodes)
++        name: Run dtests (j8_with_vnodes)
 +        no_output_timeout: 15m
-         command: |
-           echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
-           cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
- 
-           source ~/env3.6/bin/activate
-           export PATH=$JAVA_HOME/bin:$PATH
-           if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
-             export CQLSH_PYTHON=/usr/bin/python2.7
-           fi
- 
-           java -version
-           cd ~/cassandra-dtest
-           mkdir -p /tmp/dtest
- 
-           echo "env: $(env)"
-           echo "** done env"
-           mkdir -p /tmp/results/dtests
-           # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-           export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt`
-           set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j11_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++        command: "echo \"cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n  export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the e [...]
 +    - store_test_results:
 +        path: /tmp/results
 +    - store_artifacts:
 +        path: /tmp/dtest
-         destination: dtest_j11_without_vnodes
++        destination: dtest_j8_with_vnodes
 +    - store_artifacts:
 +        path: ~/cassandra-dtest/logs
-         destination: dtest_j11_without_vnodes_logs
++        destination: dtest_j8_with_vnodes_logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - CASSANDRA_USE_JDK11: true
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
++    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +  j11_cqlshlib_tests:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 1
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Run cqlshlib Unit Tests
 +        command: |
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          time mv ~/cassandra /tmp
 +          cd /tmp/cassandra/pylib
 +          ./cassandra-cqlsh-tests.sh ..
 +        no_output_timeout: 15m
 +    - store_test_results:
 +        path: /tmp/cassandra/pylib
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
 +    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - CASSANDRA_USE_JDK11: true
-   j11_repeated_utest:
++  j8_jvm_dtests_repeat:
 +    docker:
-     - image: apache/cassandra-testing-ubuntu2004-java11:latest
++    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Log Environment Information
 +        command: |
 +          echo '*** id ***'
 +          id
 +          echo '*** cat /proc/cpuinfo ***'
 +          cat /proc/cpuinfo
 +          echo '*** free -m ***'
 +          free -m
 +          echo '*** df -m ***'
 +          df -m
 +          echo '*** ifconfig -a ***'
 +          ifconfig -a
 +          echo '*** uname -a ***'
 +          uname -a
 +          echo '*** mount ***'
 +          mount
 +          echo '*** env ***'
 +          env
 +          echo '*** java ***'
 +          which java
 +          java -version
 +    - run:
-         name: Run repeated JUnit test
++        name: Repeatedly run new or modifed JUnit tests
 +        no_output_timeout: 15m
 +        command: |
-           if [ "${REPEATED_UTEST_CLASS}" == "<nil>" ]; then
-             echo "Repeated utest class name hasn't been defined, exiting without running any test"
-           elif [ "${REPEATED_UTEST_COUNT}" == "<nil>" ]; then
-             echo "Repeated utest count hasn't been defined, exiting without running any test"
-           elif [ "${REPEATED_UTEST_COUNT}" -le 0 ]; then
-             echo "Repeated utest count is lesser or equals than zero, exiting without running any test"
-           else
++          set -x
++          export PATH=$JAVA_HOME/bin:$PATH
++          time mv ~/cassandra /tmp
++          cd /tmp/cassandra
++          if [ -d ~/dtest_jars ]; then
++            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
++          fi
 +
-             # Calculate the number of test iterations to be run by the current parallel runner.
-             # Since we are running the same test multiple times there is no need to use `circleci tests split`.
-             count=$((${REPEATED_UTEST_COUNT} / CIRCLE_NODE_TOTAL))
-             if (($CIRCLE_NODE_INDEX < (${REPEATED_UTEST_COUNT} % CIRCLE_NODE_TOTAL))); then
-               count=$((count+1))
-             fi
++          # Calculate the number of test iterations to be run by the current parallel runner.
++          count=$((${REPEATED_JVM_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
++          if (($CIRCLE_NODE_INDEX < (${REPEATED_JVM_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
++            count=$((count+1))
++          fi
 +
-             if (($count <= 0)); then
-               echo "No tests to run in this runner"
-             else
-               echo "Running ${REPEATED_UTEST_TARGET} ${REPEATED_UTEST_CLASS} ${REPEATED_UTEST_METHODS} ${REPEATED_UTEST_COUNT} times"
++          # Put manually specified tests and automatically detected tests together, removing duplicates
++          tests=$(echo ${REPEATED_JVM_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
++          echo "Tests to be repeated: ${tests}"
 +
-               set -x
-               export PATH=$JAVA_HOME/bin:$PATH
-               time mv ~/cassandra /tmp
-               cd /tmp/cassandra
-               if [ -d ~/dtest_jars ]; then
-                 cp ~/dtest_jars/dtest* /tmp/cassandra/build/
-               fi
++          # Run each test class as many times as requested.
++          exit_code="$?"
++          for test in $tests; do
 +
-               target=${REPEATED_UTEST_TARGET}
-               class_path=${REPEATED_UTEST_CLASS}
-               class_name="${class_path##*.}"
++              # Split class and method names from the test name
++              if [[ $test =~ "#" ]]; then
++                class=${test%"#"*}
++                method=${test#*"#"}
++              else
++                class=$test
++                method=""
++              fi
 +
 +              # Prepare the -Dtest.name argument.
 +              # It can be the fully qualified class name or the short class name, depending on the target.
 +              if [[ $target == "test" || \
 +                    $target == "test-cdc" || \
 +                    $target == "test-compression" || \
-                     $target == "test-system-keyspace-directory" ]]; then
-                 name="-Dtest.name=$class_name"
++                    $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
++                    $target == "long-test" || \
++                    $target == "stress-test" ]]; then
++                name_arg="-Dtest.name=${class##*.}"
 +              else
-                 name="-Dtest.name=$class_path"
++                name_arg="-Dtest.name=$class"
                fi
  
 -              upgrade_arg=""
 -              if false; then
 -                upgrade_arg="--execute-upgrade-tests --upgrade-target-version-only --upgrade-version-selection all"
 +              # Prepare the -Dtest.methods argument, which is optional
-               if [ "${REPEATED_UTEST_METHODS}" == "<nil>" ]; then
-                 methods=""
++              if [ $method == "" ]; then
++                methods_arg=""
 +              else
-                 methods="-Dtest.methods=${REPEATED_UTEST_METHODS}"
++                methods_arg="-Dtest.methods=$method"
                fi
  
-               # Run the test target as many times as requested collecting the exit code,
-               # stopping the iteration only if stop_on_failure is set.
-               exit_code="$?"
 -              # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
 -              set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $tests_arg | tee /tmp/dtest/stdout.txt
 -            fi
 -          fi
 +              for i in $(seq -w 1 $count); do
- 
-                 echo "Running test iteration $i of $count"
++                echo "Running test $test, iteration $i of $count"
 +
 +                # run the test
 +                status="passes"
-                 if !( set -o pipefail && ant $target $name $methods -Dno-build-test=true | tee stdout.txt ); then
++                if !( set -o pipefail && \
++                      ant test-jvm-dtest-some $name_arg $methods_arg -Dno-build-test=true | \
++                      tee stdout.txt \
++                    ); then
 +                  status="fails"
 +                  exit_code=1
 +                fi
 +
 +                # move the stdout output file
-                 dest=/tmp/results/repeated_utest/stdout/${status}/${i}
++                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
 +                mkdir -p $dest
-                 mv stdout.txt $dest/${REPEATED_UTEST_TARGET}-${REPEATED_UTEST_CLASS}.txt
++                mv stdout.txt $dest/${test}.txt
 +
 +                # move the XML output files
 +                source=build/test/output
-                 dest=/tmp/results/repeated_utest/output/${status}/${i}
++                dest=/tmp/results/repeated_utests/output/${status}/${i}
 +                mkdir -p $dest
 +                if [[ -d $source && -n "$(ls $source)" ]]; then
 +                  mv $source/* $dest/
 +                fi
 +
 +                # move the log files
 +                source=build/test/logs
-                 dest=/tmp/results/repeated_utest/logs/${status}/${i}
++                dest=/tmp/results/repeated_utests/logs/${status}/${i}
 +                mkdir -p $dest
 +                if [[ -d $source && -n "$(ls $source)" ]]; then
 +                  mv $source/* $dest/
 +                fi
 +
 +                # maybe stop iterations on test failure
-                 if [[ ${REPEATED_UTEST_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
++                if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
 +                  break
 +                fi
 +              done
- 
-               (exit ${exit_code})
-             fi
-           fi
++          done
++          (exit ${exit_code})
      - store_test_results:
-         path: /tmp/results/repeated_utest/output
 -        path: /tmp/results
++        path: /tmp/results/repeated_utests/output
      - store_artifacts:
-         path: /tmp/results/repeated_utest/stdout
 -        path: /tmp/dtest
 -        destination: dtest
++        path: /tmp/results/repeated_utests/stdout
 +        destination: stdout
      - store_artifacts:
-         path: /tmp/results/repeated_utest/output
 -        path: ~/cassandra-dtest/logs
 -        destination: dtest_logs
++        path: /tmp/results/repeated_utests/output
 +        destination: junitxml
 +    - store_artifacts:
-         path: /tmp/results/repeated_utest/logs
++        path: /tmp/results/repeated_utests/logs
 +        destination: logs
      environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - LANG: en_US.UTF-8
      - KEEP_TEST_DIR: true
      - DEFAULT_DIR: /home/cassandra/cassandra-dtest
@@@ -2505,28 -1158,30 +4392,32 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - CASSANDRA_USE_JDK11: true
-   j8_dtests-with-vnodes:
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
+     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  j8_upgrade_dtests:
++  j11_dtests:
      docker:
--    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
++    - image: apache/cassandra-testing-ubuntu2004-java11:latest
      resource_class: medium
      working_directory: ~/
      shell: /bin/bash -eo pipefail -l
@@@ -2534,6 -1189,6 +4425,28 @@@
      steps:
      - attach_workspace:
          at: /home/cassandra
++    - run:
++        name: Log Environment Information
++        command: |
++          echo '*** id ***'
++          id
++          echo '*** cat /proc/cpuinfo ***'
++          cat /proc/cpuinfo
++          echo '*** free -m ***'
++          free -m
++          echo '*** df -m ***'
++          df -m
++          echo '*** ifconfig -a ***'
++          ifconfig -a
++          echo '*** uname -a ***'
++          uname -a
++          echo '*** mount ***'
++          mount
++          echo '*** env ***'
++          env
++          echo '*** java ***'
++          which java
++          java -version
      - run:
          name: Clone Cassandra dtest Repository (via git)
          command: |
@@@ -2547,29 -1202,243 +4460,213 @@@
            # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
            source ~/env3.6/bin/activate
            export PATH=$JAVA_HOME/bin:$PATH
 -          pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
            pip3 freeze
      - run:
-         name: Determine Tests to Run (j8_with_vnodes)
 -        name: Determine Tests to Run (j8_upgradetests_without_vnodes)
++        name: Determine Tests to Run (j11_without_vnodes)
          no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
 -        command: |
 -          # reminder: this code (along with all the steps) is independently executed on every circle container
 -          # so the goal here is to get the circleci script to return the tests *this* container will run
 -          # which we do via the `circleci` cli tool.
 -
 -          cd cassandra-dtest
 -          source ~/env3.6/bin/activate
 -          export PATH=$JAVA_HOME/bin:$PATH
 -
 -          if [ -n 'RUN_STATIC_UPGRADE_MATRIX=true' ]; then
 -            export RUN_STATIC_UPGRADE_MATRIX=true
 -          fi
 -
 -          echo "***Collected DTests (j8_upgradetests_without_vnodes)***"
 -          set -eo pipefail && ./run_dtests.py --execute-upgrade-tests --dtest-print-tests-only --dtest-print-tests-output=/tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw --cassandra-dir=../cassandra
 -          if [ -z '^upgrade_tests' ]; then
 -            mv /tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw /tmp/all_dtest_tests_j8_upgradetests_without_vnodes
 -          else
 -            grep -e '^upgrade_tests' /tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw > /tmp/all_dtest_tests_j8_upgradetests_without_vnodes || { echo "Filter did not match any tests! Exiting build."; exit 0; }
 -          fi
 -          set -eo pipefail && circleci tests split --split-by=timings --timings-type=classname /tmp/all_dtest_tests_j8_upgradetests_without_vnodes > /tmp/split_dtest_tests_j8_upgradetests_without_vnodes.txt
 -          cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes.txt | tr '\n' ' ' > /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
 -          cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource- [...]
      - run:
-         name: Run dtests (j8_with_vnodes)
 -        name: Run dtests (j8_upgradetests_without_vnodes)
++        name: Run dtests (j11_without_vnodes)
          no_output_timeout: 15m
-         command: "echo \"cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n  export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the e [...]
 -        command: |
 -          echo "cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt"
 -          cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
 -
 -          source ~/env3.6/bin/activate
 -          export PATH=$JAVA_HOME/bin:$PATH
 -          if [ -n 'RUN_STATIC_UPGRADE_MATRIX=true' ]; then
 -            export RUN_STATIC_UPGRADE_MATRIX=true
 -          fi
 -
 -          java -version
 -          cd ~/cassandra-dtest
 -          mkdir -p /tmp/dtest
 -
 -          echo "env: $(env)"
 -          echo "** done env"
 -          mkdir -p /tmp/results/dtests
 -          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
 -          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt`
 -          set -o pipefail && cd ~/cassandra-dtest && pytest --execute-upgrade-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j8_upgradetests_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++        command: "echo \"cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n  export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and n [...]
+     - store_test_results:
+         path: /tmp/results
+     - store_artifacts:
+         path: /tmp/dtest
 -        destination: dtest_j8_upgradetests_without_vnodes
++        destination: dtest_j11_without_vnodes
+     - store_artifacts:
+         path: ~/cassandra-dtest/logs
 -        destination: dtest_j8_upgradetests_without_vnodes_logs
++        destination: dtest_j11_without_vnodes_logs
+     environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - ANT_HOME: /usr/share/ant
++    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - LANG: en_US.UTF-8
+     - KEEP_TEST_DIR: true
+     - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+     - PYTHONIOENCODING: utf-8
+     - PYTHONUNBUFFERED: true
+     - CASS_DRIVER_NO_EXTENSIONS: true
+     - CASS_DRIVER_NO_CYTHON: true
+     - CASSANDRA_SKIP_SYNC: true
+     - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
+     - DTEST_BRANCH: trunk
+     - CCM_MAX_HEAP_SIZE: 1024M
+     - CCM_HEAP_NEWSIZE: 256M
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
 -    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  j8_jvm_upgrade_dtests_repeat:
++    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - CASSANDRA_USE_JDK11: true
++  j8_repeated_ant_test:
+     docker:
+     - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
+     resource_class: medium
+     working_directory: ~/
+     shell: /bin/bash -eo pipefail -l
+     parallelism: 4
+     steps:
+     - attach_workspace:
+         at: /home/cassandra
+     - run:
+         name: Log Environment Information
+         command: |
+           echo '*** id ***'
+           id
+           echo '*** cat /proc/cpuinfo ***'
+           cat /proc/cpuinfo
+           echo '*** free -m ***'
+           free -m
+           echo '*** df -m ***'
+           df -m
+           echo '*** ifconfig -a ***'
+           ifconfig -a
+           echo '*** uname -a ***'
+           uname -a
+           echo '*** mount ***'
+           mount
+           echo '*** env ***'
+           env
+           echo '*** java ***'
+           which java
+           java -version
+     - run:
 -        name: Repeatedly run new or modifed JUnit tests
++        name: Run repeated JUnit test
+         no_output_timeout: 15m
+         command: |
 -          set -x
 -          export PATH=$JAVA_HOME/bin:$PATH
 -          time mv ~/cassandra /tmp
 -          cd /tmp/cassandra
 -          if [ -d ~/dtest_jars ]; then
 -            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 -          fi
 -
 -          # Calculate the number of test iterations to be run by the current parallel runner.
 -          count=$((${REPEATED_JVM_UPGRADE_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
 -          if (($CIRCLE_NODE_INDEX < (${REPEATED_JVM_UPGRADE_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
 -            count=$((count+1))
 -          fi
++          if [ "${REPEATED_ANT_TEST_CLASS}" == "<nil>" ]; then
++            echo "Repeated utest class name hasn't been defined, exiting without running any test"
++          elif [ "${REPEATED_ANT_TEST_COUNT}" == "<nil>" ]; then
++            echo "Repeated utest count hasn't been defined, exiting without running any test"
++          elif [ "${REPEATED_ANT_TEST_COUNT}" -le 0 ]; then
++            echo "Repeated utest count is lesser or equals than zero, exiting without running any test"
++          else
+ 
 -          # Put manually specified tests and automatically detected tests together, removing duplicates
 -          tests=$(echo ${REPEATED_JVM_UPGRADE_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
 -          echo "Tests to be repeated: ${tests}"
++            # Calculate the number of test iterations to be run by the current parallel runner.
++            # Since we are running the same test multiple times there is no need to use `circleci tests split`.
++            count=$((${REPEATED_ANT_TEST_COUNT} / CIRCLE_NODE_TOTAL))
++            if (($CIRCLE_NODE_INDEX < (${REPEATED_ANT_TEST_COUNT} % CIRCLE_NODE_TOTAL))); then
++              count=$((count+1))
++            fi
+ 
 -          # Run each test class as many times as requested.
 -          exit_code="$?"
 -          for test in $tests; do
++            if (($count <= 0)); then
++              echo "No tests to run in this runner"
++            else
++              echo "Running ${REPEATED_ANT_TEST_TARGET} ${REPEATED_ANT_TEST_CLASS} ${REPEATED_ANT_TEST_METHODS} ${REPEATED_ANT_TEST_COUNT} times"
+ 
 -              # Split class and method names from the test name
 -              if [[ $test =~ "#" ]]; then
 -                class=${test%"#"*}
 -                method=${test#*"#"}
 -              else
 -                class=$test
 -                method=""
++              set -x
++              export PATH=$JAVA_HOME/bin:$PATH
++              time mv ~/cassandra /tmp
++              cd /tmp/cassandra
++              if [ -d ~/dtest_jars ]; then
++                cp ~/dtest_jars/dtest* /tmp/cassandra/build/
+               fi
+ 
++              target=${REPEATED_ANT_TEST_TARGET}
++              class_path=${REPEATED_ANT_TEST_CLASS}
++              class_name="${class_path##*.}"
++
+               # Prepare the -Dtest.name argument.
+               # It can be the fully qualified class name or the short class name, depending on the target.
+               if [[ $target == "test" || \
+                     $target == "test-cdc" || \
+                     $target == "test-compression" || \
+                     $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
+                     $target == "long-test" || \
+                     $target == "stress-test" ]]; then
 -                name_arg="-Dtest.name=${class##*.}"
++                name="-Dtest.name=$class_name"
+               else
 -                name_arg="-Dtest.name=$class"
++                name="-Dtest.name=$class_path"
+               fi
+ 
+               # Prepare the -Dtest.methods argument, which is optional
 -              if [ $method == "" ]; then
 -                methods_arg=""
++              if [ "${REPEATED_ANT_TEST_METHODS}" == "<nil>" ]; then
++                methods=""
+               else
 -                methods_arg="-Dtest.methods=$method"
++                methods="-Dtest.methods=${REPEATED_ANT_TEST_METHODS}"
+               fi
+ 
++              # Run the test target as many times as requested collecting the exit code,
++              # stopping the iteration only if stop_on_failure is set.
++              exit_code="$?"
+               for i in $(seq -w 1 $count); do
 -                echo "Running test $test, iteration $i of $count"
++
++                echo "Running test iteration $i of $count"
+ 
+                 # run the test
+                 status="passes"
 -                if !( set -o pipefail && \
 -                      ant test-jvm-dtest-some $name_arg $methods_arg -Dno-build-test=true | \
 -                      tee stdout.txt \
 -                    ); then
++                if !( set -o pipefail && ant $target $name $methods -Dno-build-test=true | tee stdout.txt ); then
+                   status="fails"
+                   exit_code=1
+                 fi
+ 
+                 # move the stdout output file
 -                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
++                dest=/tmp/results/repeated_utest/stdout/${status}/${i}
+                 mkdir -p $dest
 -                mv stdout.txt $dest/${test}.txt
++                mv stdout.txt $dest/${REPEATED_ANT_TEST_TARGET}-${REPEATED_ANT_TEST_CLASS}.txt
+ 
+                 # move the XML output files
+                 source=build/test/output
 -                dest=/tmp/results/repeated_utests/output/${status}/${i}
++                dest=/tmp/results/repeated_utest/output/${status}/${i}
+                 mkdir -p $dest
+                 if [[ -d $source && -n "$(ls $source)" ]]; then
+                   mv $source/* $dest/
+                 fi
+ 
+                 # move the log files
+                 source=build/test/logs
 -                dest=/tmp/results/repeated_utests/logs/${status}/${i}
++                dest=/tmp/results/repeated_utest/logs/${status}/${i}
+                 mkdir -p $dest
+                 if [[ -d $source && -n "$(ls $source)" ]]; then
+                   mv $source/* $dest/
+                 fi
+ 
+                 # maybe stop iterations on test failure
+                 if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
+                   break
+                 fi
+               done
 -          done
 -          (exit ${exit_code})
++
++              (exit ${exit_code})
++            fi
++          fi
      - store_test_results:
-         path: /tmp/results
 -        path: /tmp/results/repeated_utests/output
++        path: /tmp/results/repeated_utest/output
      - store_artifacts:
-         path: /tmp/dtest
-         destination: dtest_j8_with_vnodes
 -        path: /tmp/results/repeated_utests/stdout
++        path: /tmp/results/repeated_utest/stdout
+         destination: stdout
      - store_artifacts:
-         path: ~/cassandra-dtest/logs
-         destination: dtest_j8_with_vnodes_logs
 -        path: /tmp/results/repeated_utests/output
++        path: /tmp/results/repeated_utest/output
+         destination: junitxml
+     - store_artifacts:
 -        path: /tmp/results/repeated_utests/logs
++        path: /tmp/results/repeated_utest/logs
+         destination: logs
      environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - LANG: en_US.UTF-8
      - KEEP_TEST_DIR: true
      - DEFAULT_DIR: /home/cassandra/cassandra-dtest
@@@ -2582,27 -1451,30 +4679,32 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j11_cqlsh-dtests-py38-no-vnodes:
 -  utests_stress:
++  j8_dtests_repeat:
      docker:
-     - image: apache/cassandra-testing-ubuntu2004-java11:latest
+     - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
      resource_class: medium
      working_directory: ~/
      shell: /bin/bash -eo pipefail -l
@@@ -2611,60 -1483,27 +4713,89 @@@
      - attach_workspace:
          at: /home/cassandra
      - run:
 -        name: Run Unit Tests (stress-test)
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
          command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
-           source ~/env3.8/bin/activate
++          source ~/env3.6/bin/activate
            export PATH=$JAVA_HOME/bin:$PATH
 -          time mv ~/cassandra /tmp
 -          cd /tmp/cassandra
 -          if [ -d ~/dtest_jars ]; then
 -            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
-         name: Determine Tests to Run (j11_without_vnodes)
-         no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource- [...]
-     - run:
-         name: Run dtests (j11_without_vnodes)
++        name: Run repeated Python dtest
 +        no_output_timeout: 15m
 +        command: |
-           echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
-           cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
++          if [ "${REPEATED_DTESTS}" == "<nil>" ]; then
++            echo "Repeated dtest name hasn't been defined, exiting without running any test"
++          elif [ "${REPEATED_DTESTS_COUNT}" == "<nil>" ]; then
++            echo "Repeated dtest count hasn't been defined, exiting without running any test"
++          elif [ "${REPEATED_DTESTS_COUNT}" -le 0 ]; then
++            echo "Repeated dtest count is lesser or equals than zero, exiting without running any test"
++          else
 +
-           source ~/env3.8/bin/activate
-           export PATH=$JAVA_HOME/bin:$PATH
-           if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
-             export CQLSH_PYTHON=/usr/bin/python3.8
-           fi
++            # Calculate the number of test iterations to be run by the current parallel runner.
++            # Since we are running the same test multiple times there is no need to use `circleci tests split`.
++            count=$((${REPEATED_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
++            if (($CIRCLE_NODE_INDEX < (${REPEATED_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
++              count=$((count+1))
++            fi
 +
-           java -version
-           cd ~/cassandra-dtest
-           mkdir -p /tmp/dtest
++            if (($count <= 0)); then
++              echo "No tests to run in this runner"
++            else
++              echo "Running ${REPEATED_DTESTS} $count times"
 +
-           echo "env: $(env)"
-           echo "** done env"
-           mkdir -p /tmp/results/dtests
-           # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-           export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt`
-           set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j11_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++              source ~/env3.6/bin/activate
++              export PATH=$JAVA_HOME/bin:$PATH
++
++              java -version
++              cd ~/cassandra-dtest
++              mkdir -p /tmp/dtest
++
++              echo "env: $(env)"
++              echo "** done env"
++              mkdir -p /tmp/results/dtests
++
++              tests_arg=$(echo ${REPEATED_DTESTS} | sed -e "s/,/ /g")
++
++              stop_on_failure_arg=""
++              if ${REPEATED_TESTS_STOP_ON_FAILURE}; then
++                stop_on_failure_arg="-x"
++              fi
++
++              vnodes_args=""
++              if false; then
++                vnodes_args="--use-vnodes --num-tokens=16"
++              fi
++
++              upgrade_arg=""
++              if false; then
++                upgrade_arg="--execute-upgrade-tests --upgrade-target-version-only --upgrade-version-selection all"
++              fi
++
++              # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
++              set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $tests_arg | tee /tmp/dtest/stdout.txt
++            fi
+           fi
 -          ant stress-test -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt  -Dtest.classlistprefix=unit
 -        no_output_timeout: 15m
      - store_test_results:
 -        path: /tmp/cassandra/build/test/output/
 +        path: /tmp/results
      - store_artifacts:
 -        path: /tmp/cassandra/build/test/output
 -        destination: junitxml
 +        path: /tmp/dtest
-         destination: dtest_j11_without_vnodes
++        destination: dtest
      - store_artifacts:
 -        path: /tmp/cassandra/build/test/logs
 -        destination: logs
 +        path: ~/cassandra-dtest/logs
-         destination: dtest_j11_without_vnodes_logs
++        destination: dtest_logs
      environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - LANG: en_US.UTF-8
      - KEEP_TEST_DIR: true
      - DEFAULT_DIR: /home/cassandra/cassandra-dtest
@@@ -2677,26 -1516,28 +4808,30 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - CASSANDRA_USE_JDK11: true
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
+     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  j8_unit_tests:
 +  j8_jvm_dtests:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
      resource_class: medium
@@@ -2787,25 -1627,28 +4922,30 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  j8_dtests:
 +  j8_build:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
      resource_class: medium
@@@ -2885,25 -1704,28 +5025,30 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j8_cqlsh-dtests-py3-no-vnodes:
 -  j8_dtests_vnode:
++  j8_cqlsh_dtests_py38_vnode:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
      resource_class: medium
@@@ -2924,50 -1746,29 +5069,50 @@@
            # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
            # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
            # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
--          source ~/env3.6/bin/activate
++          source ~/env3.8/bin/activate
            export PATH=$JAVA_HOME/bin:$PATH
 -          pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
            pip3 freeze
      - run:
-         name: Determine Tests to Run (j8_without_vnodes)
+         name: Determine Tests to Run (j8_with_vnodes)
          no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
 -        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
      - run:
-         name: Run dtests (j8_without_vnodes)
+         name: Run dtests (j8_with_vnodes)
          no_output_timeout: 15m
 -        command: "echo \"cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n  export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the e [...]
 +        command: |
-           echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
-           cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
++          echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
++          cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
 +
-           source ~/env3.6/bin/activate
++          source ~/env3.8/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
-           if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
-             export CQLSH_PYTHON=/usr/bin/python3.6
++          if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
++            export CQLSH_PYTHON=/usr/bin/python3.8
 +          fi
 +
 +          java -version
 +          cd ~/cassandra-dtest
 +          mkdir -p /tmp/dtest
 +
 +          echo "env: $(env)"
 +          echo "** done env"
 +          mkdir -p /tmp/results/dtests
 +          # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-           export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt`
-           set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j8_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++          export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt`
++          set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=16 --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j8_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
      - store_test_results:
          path: /tmp/results
      - store_artifacts:
          path: /tmp/dtest
-         destination: dtest_j8_without_vnodes
+         destination: dtest_j8_with_vnodes
      - store_artifacts:
          path: ~/cassandra-dtest/logs
-         destination: dtest_j8_without_vnodes_logs
+         destination: dtest_j8_with_vnodes_logs
      environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - LANG: en_US.UTF-8
      - KEEP_TEST_DIR: true
      - DEFAULT_DIR: /home/cassandra/cassandra-dtest
@@@ -2980,89 -1781,169 +5125,62 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
 -    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  j8_jvm_dtests_repeat:
 -    docker:
 -    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 -    resource_class: medium
 -    working_directory: ~/
 -    shell: /bin/bash -eo pipefail -l
 -    parallelism: 4
 -    steps:
 -    - attach_workspace:
 -        at: /home/cassandra
 -    - run:
 -        name: Log Environment Information
 -        command: |
 -          echo '*** id ***'
 -          id
 -          echo '*** cat /proc/cpuinfo ***'
 -          cat /proc/cpuinfo
 -          echo '*** free -m ***'
 -          free -m
 -          echo '*** df -m ***'
 -          df -m
 -          echo '*** ifconfig -a ***'
 -          ifconfig -a
 -          echo '*** uname -a ***'
 -          uname -a
 -          echo '*** mount ***'
 -          mount
 -          echo '*** env ***'
 -          env
 -          echo '*** java ***'
 -          which java
 -          java -version
 -    - run:
 -        name: Repeatedly run new or modifed JUnit tests
 -        no_output_timeout: 15m
 -        command: |
 -          set -x
 -          export PATH=$JAVA_HOME/bin:$PATH
 -          time mv ~/cassandra /tmp
 -          cd /tmp/cassandra
 -          if [ -d ~/dtest_jars ]; then
 -            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 -          fi
 -
 -          # Calculate the number of test iterations to be run by the current parallel runner.
 -          count=$((${REPEATED_JVM_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
 -          if (($CIRCLE_NODE_INDEX < (${REPEATED_JVM_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
 -            count=$((count+1))
 -          fi
 -
 -          # Put manually specified tests and automatically detected tests together, removing duplicates
 -          tests=$(echo ${REPEATED_JVM_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
 -          echo "Tests to be repeated: ${tests}"
 -
 -          # Run each test class as many times as requested.
 -          exit_code="$?"
 -          for test in $tests; do
 -
 -              # Split class and method names from the test name
 -              if [[ $test =~ "#" ]]; then
 -                class=${test%"#"*}
 -                method=${test#*"#"}
 -              else
 -                class=$test
 -                method=""
 -              fi
 -
 -              # Prepare the -Dtest.name argument.
 -              # It can be the fully qualified class name or the short class name, depending on the target.
 -              if [[ $target == "test" || \
 -                    $target == "test-cdc" || \
 -                    $target == "test-compression" || \
 -                    $target == "test-system-keyspace-directory" || \
 -                    $target == "long-test" || \
 -                    $target == "stress-test" ]]; then
 -                name_arg="-Dtest.name=${class##*.}"
 -              else
 -                name_arg="-Dtest.name=$class"
 -              fi
 -
 -              # Prepare the -Dtest.methods argument, which is optional
 -              if [ $method == "" ]; then
 -                methods_arg=""
 -              else
 -                methods_arg="-Dtest.methods=$method"
 -              fi
 -
 -              for i in $(seq -w 1 $count); do
 -                echo "Running test $test, iteration $i of $count"
 -
 -                # run the test
 -                status="passes"
 -                if !( set -o pipefail && \
 -                      ant test-jvm-dtest-some $name_arg $methods_arg -Dno-build-test=true | \
 -                      tee stdout.txt \
 -                    ); then
 -                  status="fails"
 -                  exit_code=1
 -                fi
 -
 -                # move the stdout output file
 -                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
 -                mkdir -p $dest
 -                mv stdout.txt $dest/${test}.txt
 -
 -                # move the XML output files
 -                source=build/test/output
 -                dest=/tmp/results/repeated_utests/output/${status}/${i}
 -                mkdir -p $dest
 -                if [[ -d $source && -n "$(ls $source)" ]]; then
 -                  mv $source/* $dest/
 -                fi
 -
 -                # move the log files
 -                source=build/test/logs
 -                dest=/tmp/results/repeated_utests/logs/${status}/${i}
 -                mkdir -p $dest
 -                if [[ -d $source && -n "$(ls $source)" ]]; then
 -                  mv $source/* $dest/
 -                fi
 -
 -                # maybe stop iterations on test failure
 -                if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
 -                  break
 -                fi
 -              done
 -          done
 -          (exit ${exit_code})
 +    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j8_cqlsh-dtests-py38-with-vnodes:
++  utests_long:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
-     parallelism: 4
++    parallelism: 1
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
-         name: Clone Cassandra dtest Repository (via git)
-         command: |
-           git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
-     - run:
-         name: Configure virtualenv and python Dependencies
-         command: |
-           # note, this should be super quick as all dependencies should be pre-installed in the docker image
-           # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
-           # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
-           # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
-           source ~/env3.8/bin/activate
-           export PATH=$JAVA_HOME/bin:$PATH
-           pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
-           pip3 uninstall -y cqlsh
-           pip3 freeze
-     - run:
-         name: Determine Tests to Run (j8_with_vnodes)
-         no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
-     - run:
-         name: Run dtests (j8_with_vnodes)
-         no_output_timeout: 15m
++        name: Run Unit Tests (long-test)
 +        command: |
-           echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
-           cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
- 
-           source ~/env3.8/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
-           if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
-             export CQLSH_PYTHON=/usr/bin/python3.8
++          time mv ~/cassandra /tmp
++          cd /tmp/cassandra
++          if [ -d ~/dtest_jars ]; then
++            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 +          fi
- 
-           java -version
-           cd ~/cassandra-dtest
-           mkdir -p /tmp/dtest
- 
-           echo "env: $(env)"
-           echo "** done env"
-           mkdir -p /tmp/results/dtests
-           # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
-           export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt`
-           set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=16 --skip-resource-intensive-tests --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_j8_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
++          ant long-test
++        no_output_timeout: 15m
      - store_test_results:
-         path: /tmp/results
 -        path: /tmp/results/repeated_utests/output
 -    - store_artifacts:
 -        path: /tmp/results/repeated_utests/stdout
 -        destination: stdout
++        path: /tmp/cassandra/build/test/output/
      - store_artifacts:
-         path: /tmp/dtest
-         destination: dtest_j8_with_vnodes
 -        path: /tmp/results/repeated_utests/output
++        path: /tmp/cassandra/build/test/output
+         destination: junitxml
      - store_artifacts:
-         path: ~/cassandra-dtest/logs
-         destination: dtest_j8_with_vnodes_logs
 -        path: /tmp/results/repeated_utests/logs
++        path: /tmp/cassandra/build/test/logs
+         destination: logs
      environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - LANG: en_US.UTF-8
      - KEEP_TEST_DIR: true
      - DEFAULT_DIR: /home/cassandra/cassandra-dtest
@@@ -3075,27 -1956,30 +5193,32 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   utests_long:
 -  j8_repeated_ant_test:
++  j11_unit_tests_repeat:
      docker:
--    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
++    - image: apache/cassandra-testing-ubuntu2004-java11:latest
      resource_class: medium
      working_directory: ~/
      shell: /bin/bash -eo pipefail -l
@@@ -3104,28 -1988,266 +5227,139 @@@
      - attach_workspace:
          at: /home/cassandra
      - run:
-         name: Run Unit Tests (long-test)
+         name: Log Environment Information
+         command: |
+           echo '*** id ***'
+           id
+           echo '*** cat /proc/cpuinfo ***'
+           cat /proc/cpuinfo
+           echo '*** free -m ***'
+           free -m
+           echo '*** df -m ***'
+           df -m
+           echo '*** ifconfig -a ***'
+           ifconfig -a
+           echo '*** uname -a ***'
+           uname -a
+           echo '*** mount ***'
+           mount
+           echo '*** env ***'
+           env
+           echo '*** java ***'
+           which java
+           java -version
+     - run:
 -        name: Run repeated JUnit test
++        name: Repeatedly run new or modifed JUnit tests
+         no_output_timeout: 15m
          command: |
 -          if [ "${REPEATED_ANT_TEST_CLASS}" == "<nil>" ]; then
 -            echo "Repeated utest class name hasn't been defined, exiting without running any test"
 -          elif [ "${REPEATED_ANT_TEST_COUNT}" == "<nil>" ]; then
 -            echo "Repeated utest count hasn't been defined, exiting without running any test"
 -          elif [ "${REPEATED_ANT_TEST_COUNT}" -le 0 ]; then
 -            echo "Repeated utest count is lesser or equals than zero, exiting without running any test"
 -          else
++          set -x
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          time mv ~/cassandra /tmp
 +          cd /tmp/cassandra
 +          if [ -d ~/dtest_jars ]; then
 +            cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 +          fi
-           ant long-test
-         no_output_timeout: 15m
+ 
 -            # Calculate the number of test iterations to be run by the current parallel runner.
 -            # Since we are running the same test multiple times there is no need to use `circleci tests split`.
 -            count=$((${REPEATED_ANT_TEST_COUNT} / CIRCLE_NODE_TOTAL))
 -            if (($CIRCLE_NODE_INDEX < (${REPEATED_ANT_TEST_COUNT} % CIRCLE_NODE_TOTAL))); then
 -              count=$((count+1))
 -            fi
++          # Calculate the number of test iterations to be run by the current parallel runner.
++          count=$((${REPEATED_UTESTS_COUNT} / CIRCLE_NODE_TOTAL))
++          if (($CIRCLE_NODE_INDEX < (${REPEATED_UTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
++            count=$((count+1))
++          fi
+ 
 -            if (($count <= 0)); then
 -              echo "No tests to run in this runner"
 -            else
 -              echo "Running ${REPEATED_ANT_TEST_TARGET} ${REPEATED_ANT_TEST_CLASS} ${REPEATED_ANT_TEST_METHODS} ${REPEATED_ANT_TEST_COUNT} times"
++          # Put manually specified tests and automatically detected tests together, removing duplicates
++          tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
++          echo "Tests to be repeated: ${tests}"
+ 
 -              set -x
 -              export PATH=$JAVA_HOME/bin:$PATH
 -              time mv ~/cassandra /tmp
 -              cd /tmp/cassandra
 -              if [ -d ~/dtest_jars ]; then
 -                cp ~/dtest_jars/dtest* /tmp/cassandra/build/
 -              fi
++          # Run each test class as many times as requested.
++          exit_code="$?"
++          for test in $tests; do
+ 
 -              target=${REPEATED_ANT_TEST_TARGET}
 -              class_path=${REPEATED_ANT_TEST_CLASS}
 -              class_name="${class_path##*.}"
++              # Split class and method names from the test name
++              if [[ $test =~ "#" ]]; then
++                class=${test%"#"*}
++                method=${test#*"#"}
++              else
++                class=$test
++                method=""
++              fi
+ 
+               # Prepare the -Dtest.name argument.
+               # It can be the fully qualified class name or the short class name, depending on the target.
+               if [[ $target == "test" || \
+                     $target == "test-cdc" || \
+                     $target == "test-compression" || \
+                     $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
+                     $target == "long-test" || \
+                     $target == "stress-test" ]]; then
 -                name="-Dtest.name=$class_name"
++                name_arg="-Dtest.name=${class##*.}"
+               else
 -                name="-Dtest.name=$class_path"
++                name_arg="-Dtest.name=$class"
+               fi
+ 
+               # Prepare the -Dtest.methods argument, which is optional
 -              if [ "${REPEATED_ANT_TEST_METHODS}" == "<nil>" ]; then
 -                methods=""
++              if [ $method == "" ]; then
++                methods_arg=""
+               else
 -                methods="-Dtest.methods=${REPEATED_ANT_TEST_METHODS}"
++                methods_arg="-Dtest.methods=$method"
+               fi
+ 
 -              # Run the test target as many times as requested collecting the exit code,
 -              # stopping the iteration only if stop_on_failure is set.
 -              exit_code="$?"
+               for i in $(seq -w 1 $count); do
 -
 -                echo "Running test iteration $i of $count"
++                echo "Running test $test, iteration $i of $count"
+ 
+                 # run the test
+                 status="passes"
 -                if !( set -o pipefail && ant $target $name $methods -Dno-build-test=true | tee stdout.txt ); then
++                if !( set -o pipefail && \
++                      ant testsome $name_arg $methods_arg -Dno-build-test=true | \
++                      tee stdout.txt \
++                    ); then
+                   status="fails"
+                   exit_code=1
+                 fi
+ 
+                 # move the stdout output file
 -                dest=/tmp/results/repeated_utest/stdout/${status}/${i}
++                dest=/tmp/results/repeated_utests/stdout/${status}/${i}
+                 mkdir -p $dest
 -                mv stdout.txt $dest/${REPEATED_ANT_TEST_TARGET}-${REPEATED_ANT_TEST_CLASS}.txt
++                mv stdout.txt $dest/${test}.txt
+ 
+                 # move the XML output files
+                 source=build/test/output
 -                dest=/tmp/results/repeated_utest/output/${status}/${i}
++                dest=/tmp/results/repeated_utests/output/${status}/${i}
+                 mkdir -p $dest
+                 if [[ -d $source && -n "$(ls $source)" ]]; then
+                   mv $source/* $dest/
+                 fi
+ 
+                 # move the log files
+                 source=build/test/logs
 -                dest=/tmp/results/repeated_utest/logs/${status}/${i}
++                dest=/tmp/results/repeated_utests/logs/${status}/${i}
+                 mkdir -p $dest
+                 if [[ -d $source && -n "$(ls $source)" ]]; then
+                   mv $source/* $dest/
+                 fi
+ 
+                 # maybe stop iterations on test failure
+                 if [[ ${REPEATED_TESTS_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
+                   break
+                 fi
+               done
 -
 -              (exit ${exit_code})
 -            fi
 -          fi
++          done
++          (exit ${exit_code})
      - store_test_results:
-         path: /tmp/cassandra/build/test/output/
 -        path: /tmp/results/repeated_utest/output
++        path: /tmp/results/repeated_utests/output
      - store_artifacts:
-         path: /tmp/cassandra/build/test/output
 -        path: /tmp/results/repeated_utest/stdout
++        path: /tmp/results/repeated_utests/stdout
+         destination: stdout
+     - store_artifacts:
 -        path: /tmp/results/repeated_utest/output
 -        destination: junitxml
 -    - store_artifacts:
 -        path: /tmp/results/repeated_utest/logs
 -        destination: logs
 -    environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -    - ANT_HOME: /usr/share/ant
 -    - LANG: en_US.UTF-8
 -    - KEEP_TEST_DIR: true
 -    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 -    - PYTHONIOENCODING: utf-8
 -    - PYTHONUNBUFFERED: true
 -    - CASS_DRIVER_NO_EXTENSIONS: true
 -    - CASS_DRIVER_NO_CYTHON: true
 -    - CASSANDRA_SKIP_SYNC: true
 -    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 -    - DTEST_BRANCH: trunk
 -    - CCM_MAX_HEAP_SIZE: 1024M
 -    - CCM_HEAP_NEWSIZE: 256M
 -    - REPEATED_TESTS_STOP_ON_FAILURE: false
 -    - REPEATED_UTESTS: null
 -    - REPEATED_UTESTS_COUNT: 500
 -    - REPEATED_UTESTS_LONG: null
 -    - REPEATED_UTESTS_LONG_COUNT: 100
 -    - REPEATED_UTESTS_STRESS: null
 -    - REPEATED_UTESTS_STRESS_COUNT: 500
 -    - REPEATED_JVM_DTESTS: null
 -    - REPEATED_JVM_DTESTS_COUNT: 500
 -    - REPEATED_JVM_UPGRADE_DTESTS: null
 -    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
 -    - REPEATED_DTESTS: null
 -    - REPEATED_DTESTS_COUNT: 500
 -    - REPEATED_UPGRADE_DTESTS: null
 -    - REPEATED_UPGRADE_DTESTS_COUNT: 25
 -    - REPEATED_ANT_TEST_TARGET: testsome
 -    - REPEATED_ANT_TEST_CLASS: null
 -    - REPEATED_ANT_TEST_METHODS: null
 -    - REPEATED_ANT_TEST_COUNT: 500
 -    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  j8_dtests_repeat:
 -    docker:
 -    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 -    resource_class: medium
 -    working_directory: ~/
 -    shell: /bin/bash -eo pipefail -l
 -    parallelism: 4
 -    steps:
 -    - attach_workspace:
 -        at: /home/cassandra
 -    - run:
 -        name: Clone Cassandra dtest Repository (via git)
 -        command: |
 -          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 -    - run:
 -        name: Configure virtualenv and python Dependencies
 -        command: |
 -          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 -          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 -          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 -          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 -          source ~/env3.6/bin/activate
 -          export PATH=$JAVA_HOME/bin:$PATH
 -          pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
 -          pip3 freeze
 -    - run:
 -        name: Run repeated Python dtest
 -        no_output_timeout: 15m
 -        command: |
 -          if [ "${REPEATED_DTESTS}" == "<nil>" ]; then
 -            echo "Repeated dtest name hasn't been defined, exiting without running any test"
 -          elif [ "${REPEATED_DTESTS_COUNT}" == "<nil>" ]; then
 -            echo "Repeated dtest count hasn't been defined, exiting without running any test"
 -          elif [ "${REPEATED_DTESTS_COUNT}" -le 0 ]; then
 -            echo "Repeated dtest count is lesser or equals than zero, exiting without running any test"
 -          else
 -
 -            # Calculate the number of test iterations to be run by the current parallel runner.
 -            # Since we are running the same test multiple times there is no need to use `circleci tests split`.
 -            count=$((${REPEATED_DTESTS_COUNT} / CIRCLE_NODE_TOTAL))
 -            if (($CIRCLE_NODE_INDEX < (${REPEATED_DTESTS_COUNT} % CIRCLE_NODE_TOTAL))); then
 -              count=$((count+1))
 -            fi
 -
 -            if (($count <= 0)); then
 -              echo "No tests to run in this runner"
 -            else
 -              echo "Running ${REPEATED_DTESTS} $count times"
 -
 -              source ~/env3.6/bin/activate
 -              export PATH=$JAVA_HOME/bin:$PATH
 -
 -              java -version
 -              cd ~/cassandra-dtest
 -              mkdir -p /tmp/dtest
 -
 -              echo "env: $(env)"
 -              echo "** done env"
 -              mkdir -p /tmp/results/dtests
 -
 -              tests_arg=$(echo ${REPEATED_DTESTS} | sed -e "s/,/ /g")
 -
 -              stop_on_failure_arg=""
 -              if ${REPEATED_TESTS_STOP_ON_FAILURE}; then
 -                stop_on_failure_arg="-x"
 -              fi
 -
 -              vnodes_args=""
 -              if false; then
 -                vnodes_args="--use-vnodes --num-tokens=16"
 -              fi
 -
 -              upgrade_arg=""
 -              if false; then
 -                upgrade_arg="--execute-upgrade-tests --upgrade-target-version-only --upgrade-version-selection all"
 -              fi
 -
 -              # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
 -              set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $tests_arg | tee /tmp/dtest/stdout.txt
 -            fi
 -          fi
 -    - store_test_results:
 -        path: /tmp/results
 -    - store_artifacts:
 -        path: /tmp/dtest
 -        destination: dtest
 -    - store_artifacts:
 -        path: ~/cassandra-dtest/logs
 -        destination: dtest_logs
++        path: /tmp/results/repeated_utests/output
 +        destination: junitxml
 +    - store_artifacts:
-         path: /tmp/cassandra/build/test/logs
++        path: /tmp/results/repeated_utests/logs
 +        destination: logs
      environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - LANG: en_US.UTF-8
      - KEEP_TEST_DIR: true
      - DEFAULT_DIR: /home/cassandra/cassandra-dtest
@@@ -3138,25 -2260,28 +5372,31 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
 -    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  j8_jvm_dtests:
++    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
++    - CASSANDRA_USE_JDK11: true
 +  utests_system_keyspace_directory:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
      resource_class: medium
@@@ -3232,63 -2357,8 +5472,68 @@@
          path: /tmp/cassandra/build/test/logs
          destination: logs
      environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
      - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
 +    - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +  j8_cqlshlib_tests:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 1
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Run cqlshlib Unit Tests
 +        command: |
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          time mv ~/cassandra /tmp
 +          cd /tmp/cassandra/pylib
 +          ./cassandra-cqlsh-tests.sh ..
 +        no_output_timeout: 15m
 +    - store_test_results:
 +        path: /tmp/cassandra/pylib
 +    environment:
      - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - LANG: en_US.UTF-8
      - KEEP_TEST_DIR: true
      - DEFAULT_DIR: /home/cassandra/cassandra-dtest
@@@ -3301,25 -2371,28 +5546,30 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  utests_long:
 +  utests_fqltool:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
      resource_class: medium
@@@ -3364,123 -2436,27 +5614,133 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j11_dtests-no-vnodes:
++  j11_dtests_vnode:
 +    docker:
 +    - image: apache/cassandra-testing-ubuntu2004-java11:latest
 +    resource_class: medium
 +    working_directory: ~/
 +    shell: /bin/bash -eo pipefail -l
 +    parallelism: 4
 +    steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Log Environment Information
 +        command: |
 +          echo '*** id ***'
 +          id
 +          echo '*** cat /proc/cpuinfo ***'
 +          cat /proc/cpuinfo
 +          echo '*** free -m ***'
 +          free -m
 +          echo '*** df -m ***'
 +          df -m
 +          echo '*** ifconfig -a ***'
 +          ifconfig -a
 +          echo '*** uname -a ***'
 +          uname -a
 +          echo '*** mount ***'
 +          mount
 +          echo '*** env ***'
 +          env
 +          echo '*** java ***'
 +          which java
 +          java -version
 +    - run:
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
 +        command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
-         name: Determine Tests to Run (j11_without_vnodes)
++        name: Determine Tests to Run (j11_with_vnodes)
 +        no_output_timeout: 5m
-         command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource- [...]
++        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip [...]
 +    - run:
-         name: Run dtests (j11_without_vnodes)
++        name: Run dtests (j11_with_vnodes)
 +        no_output_timeout: 15m
-         command: "echo \"cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n  export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and n [...]
++        command: "echo \"cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n  export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the [...]
 +    - store_test_results:
 +        path: /tmp/results
 +    - store_artifacts:
 +        path: /tmp/dtest
-         destination: dtest_j11_without_vnodes
++        destination: dtest_j11_with_vnodes
 +    - store_artifacts:
 +        path: ~/cassandra-dtest/logs
-         destination: dtest_j11_without_vnodes_logs
++        destination: dtest_j11_with_vnodes_logs
 +    environment:
 +    - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 +    - LANG: en_US.UTF-8
 +    - KEEP_TEST_DIR: true
 +    - DEFAULT_DIR: /home/cassandra/cassandra-dtest
 +    - PYTHONIOENCODING: utf-8
 +    - PYTHONUNBUFFERED: true
 +    - CASS_DRIVER_NO_EXTENSIONS: true
 +    - CASS_DRIVER_NO_CYTHON: true
 +    - CASSANDRA_SKIP_SYNC: true
 +    - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
 +    - DTEST_BRANCH: trunk
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
++    - REPEATED_TESTS_STOP_ON_FAILURE: false
++    - REPEATED_UTESTS: null
++    - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
++    - REPEATED_UTESTS_LONG: null
++    - REPEATED_UTESTS_LONG_COUNT: 100
++    - REPEATED_UTESTS_STRESS: null
++    - REPEATED_UTESTS_STRESS_COUNT: 500
++    - REPEATED_JVM_DTESTS: null
++    - REPEATED_JVM_DTESTS_COUNT: 500
++    - REPEATED_JVM_UPGRADE_DTESTS: null
++    - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
++    - REPEATED_DTESTS: null
++    - REPEATED_DTESTS_COUNT: 500
++    - REPEATED_UPGRADE_DTESTS: null
++    - REPEATED_UPGRADE_DTESTS_COUNT: 25
++    - REPEATED_ANT_TEST_TARGET: testsome
++    - REPEATED_ANT_TEST_CLASS: null
++    - REPEATED_ANT_TEST_METHODS: null
++    - REPEATED_ANT_TEST_COUNT: 500
 +    - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - CASSANDRA_USE_JDK11: true
    utests_compression:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
@@@ -3572,197 -2547,25 +5832,27 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   j8_repeated_utest:
-     docker:
-     - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
-     resource_class: medium
-     working_directory: ~/
-     shell: /bin/bash -eo pipefail -l
-     parallelism: 4
-     steps:
-     - attach_workspace:
-         at: /home/cassandra
-     - run:
-         name: Log Environment Information
-         command: |
-           echo '*** id ***'
-           id
-           echo '*** cat /proc/cpuinfo ***'
-           cat /proc/cpuinfo
-           echo '*** free -m ***'
-           free -m
-           echo '*** df -m ***'
-           df -m
-           echo '*** ifconfig -a ***'
-           ifconfig -a
-           echo '*** uname -a ***'
-           uname -a
-           echo '*** mount ***'
-           mount
-           echo '*** env ***'
-           env
-           echo '*** java ***'
-           which java
-           java -version
-     - run:
-         name: Run repeated JUnit test
-         no_output_timeout: 15m
-         command: |
-           if [ "${REPEATED_UTEST_CLASS}" == "<nil>" ]; then
-             echo "Repeated utest class name hasn't been defined, exiting without running any test"
-           elif [ "${REPEATED_UTEST_COUNT}" == "<nil>" ]; then
-             echo "Repeated utest count hasn't been defined, exiting without running any test"
-           elif [ "${REPEATED_UTEST_COUNT}" -le 0 ]; then
-             echo "Repeated utest count is lesser or equals than zero, exiting without running any test"
-           else
- 
-             # Calculate the number of test iterations to be run by the current parallel runner.
-             # Since we are running the same test multiple times there is no need to use `circleci tests split`.
-             count=$((${REPEATED_UTEST_COUNT} / CIRCLE_NODE_TOTAL))
-             if (($CIRCLE_NODE_INDEX < (${REPEATED_UTEST_COUNT} % CIRCLE_NODE_TOTAL))); then
-               count=$((count+1))
-             fi
- 
-             if (($count <= 0)); then
-               echo "No tests to run in this runner"
-             else
-               echo "Running ${REPEATED_UTEST_TARGET} ${REPEATED_UTEST_CLASS} ${REPEATED_UTEST_METHODS} ${REPEATED_UTEST_COUNT} times"
- 
-               set -x
-               export PATH=$JAVA_HOME/bin:$PATH
-               time mv ~/cassandra /tmp
-               cd /tmp/cassandra
-               if [ -d ~/dtest_jars ]; then
-                 cp ~/dtest_jars/dtest* /tmp/cassandra/build/
-               fi
- 
-               target=${REPEATED_UTEST_TARGET}
-               class_path=${REPEATED_UTEST_CLASS}
-               class_name="${class_path##*.}"
- 
-               # Prepare the -Dtest.name argument.
-               # It can be the fully qualified class name or the short class name, depending on the target.
-               if [[ $target == "test" || \
-                     $target == "test-cdc" || \
-                     $target == "test-compression" || \
-                     $target == "test-system-keyspace-directory" ]]; then
-                 name="-Dtest.name=$class_name"
-               else
-                 name="-Dtest.name=$class_path"
-               fi
- 
-               # Prepare the -Dtest.methods argument, which is optional
-               if [ "${REPEATED_UTEST_METHODS}" == "<nil>" ]; then
-                 methods=""
-               else
-                 methods="-Dtest.methods=${REPEATED_UTEST_METHODS}"
-               fi
- 
-               # Run the test target as many times as requested collecting the exit code,
-               # stopping the iteration only if stop_on_failure is set.
-               exit_code="$?"
-               for i in $(seq -w 1 $count); do
- 
-                 echo "Running test iteration $i of $count"
- 
-                 # run the test
-                 status="passes"
-                 if !( set -o pipefail && ant $target $name $methods -Dno-build-test=true | tee stdout.txt ); then
-                   status="fails"
-                   exit_code=1
-                 fi
- 
-                 # move the stdout output file
-                 dest=/tmp/results/repeated_utest/stdout/${status}/${i}
-                 mkdir -p $dest
-                 mv stdout.txt $dest/${REPEATED_UTEST_TARGET}-${REPEATED_UTEST_CLASS}.txt
- 
-                 # move the XML output files
-                 source=build/test/output
-                 dest=/tmp/results/repeated_utest/output/${status}/${i}
-                 mkdir -p $dest
-                 if [[ -d $source && -n "$(ls $source)" ]]; then
-                   mv $source/* $dest/
-                 fi
- 
-                 # move the log files
-                 source=build/test/logs
-                 dest=/tmp/results/repeated_utest/logs/${status}/${i}
-                 mkdir -p $dest
-                 if [[ -d $source && -n "$(ls $source)" ]]; then
-                   mv $source/* $dest/
-                 fi
- 
-                 # maybe stop iterations on test failure
-                 if [[ ${REPEATED_UTEST_STOP_ON_FAILURE} = true ]] && (( $exit_code > 0 )); then
-                   break
-                 fi
-               done
- 
-               (exit ${exit_code})
-             fi
-           fi
-     - store_test_results:
-         path: /tmp/results/repeated_utest/output
-     - store_artifacts:
-         path: /tmp/results/repeated_utest/stdout
-         destination: stdout
-     - store_artifacts:
-         path: /tmp/results/repeated_utest/output
-         destination: junitxml
-     - store_artifacts:
-         path: /tmp/results/repeated_utest/logs
-         destination: logs
-     environment:
-     - ANT_HOME: /usr/share/ant
-     - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
-     - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - LANG: en_US.UTF-8
-     - KEEP_TEST_DIR: true
-     - DEFAULT_DIR: /home/cassandra/cassandra-dtest
-     - PYTHONIOENCODING: utf-8
-     - PYTHONUNBUFFERED: true
-     - CASS_DRIVER_NO_EXTENSIONS: true
-     - CASS_DRIVER_NO_CYTHON: true
-     - CASSANDRA_SKIP_SYNC: true
-     - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
-     - DTEST_BRANCH: trunk
-     - CCM_MAX_HEAP_SIZE: 1024M
-     - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
    j8_dtest_jars_build:
@@@ -3842,22 -2644,25 +5932,27 @@@
      - DTEST_BRANCH: trunk
      - CCM_MAX_HEAP_SIZE: 1024M
      - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
  workflows:
@@@ -3927,9 -2708,9 +6022,9 @@@
          type: approval
      - j8_dtest_jars_build:
          requires:
 -        - build
 +        - j8_build
          - start_j8_dtest_jars_build
-     - start_jvm_upgrade_dtest:
+     - start_jvm_upgrade_dtests:
          type: approval
      - j8_jvm_upgrade_dtests:
          requires:
@@@ -3937,119 -2718,23 +6032,87 @@@
          - j8_dtest_jars_build
      - start_j8_dtests:
          type: approval
-     - j8_dtests-with-vnodes:
+     - j8_dtests:
          requires:
          - start_j8_dtests
 -        - build
 +        - j8_build
-     - j8_dtests-no-vnodes:
+     - start_j8_dtests_vnode:
+         type: approval
+     - j8_dtests_vnode:
          requires:
-         - start_j8_dtests
+         - start_j8_dtests_vnode
 -        - build
 -    - start_upgrade_dtests:
 +        - j8_build
 +    - start_j11_dtests:
 +        type: approval
-     - j11_dtests-with-vnodes:
++    - j11_dtests:
 +        requires:
 +        - start_j11_dtests
 +        - j8_build
-     - j11_dtests-no-vnodes:
++    - start_j11_dtests_vnode:
++        type: approval
++    - j11_dtests_vnode:
 +        requires:
-         - start_j11_dtests
++        - start_j11_dtests_vnode
 +        - j8_build
 +    - start_upgrade_tests:
          type: approval
-     - j8_upgradetests-no-vnodes:
+     - j8_upgrade_dtests:
          requires:
 -        - start_upgrade_dtests
 -        - build
 -  pre-commit_tests:
 +        - start_upgrade_tests
 +        - j8_build
 +    - start_j8_cqlsh_tests:
 +        type: approval
 +    - j8_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +        - start_j8_cqlsh_tests
 +        - j8_build
-     - j8_cqlsh-dtests-py3-with-vnodes:
++    - j8_cqlsh_dtests_py3_vnode:
 +        requires:
 +        - start_j8_cqlsh_tests
 +        - j8_build
-     - j8_cqlsh-dtests-py38-with-vnodes:
++    - j8_cqlsh_dtests_py38_vnode:
 +        requires:
 +        - start_j8_cqlsh_tests
 +        - j8_build
 +    - j8_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +        - start_j8_cqlsh_tests
 +        - j8_build
-     - j8_cqlsh-dtests-py3-no-vnodes:
++    - j8_cqlsh_dtests_py3:
 +        requires:
 +        - start_j8_cqlsh_tests
 +        - j8_build
-     - j8_cqlsh-dtests-py38-no-vnodes:
++    - j8_cqlsh_dtests_py38:
 +        requires:
 +        - start_j8_cqlsh_tests
 +        - j8_build
 +    - start_j11_cqlsh_tests:
 +        type: approval
 +    - j11_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j8_build
-     - j11_cqlsh-dtests-py3-with-vnodes:
++    - j11_cqlsh_dtests_py3_vnode:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j8_build
-     - j11_cqlsh-dtests-py38-with-vnodes:
++    - j11_cqlsh_dtests_py38_vnode:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j8_build
 +    - j11_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j8_build
-     - j11_cqlsh-dtests-py3-no-vnodes:
++    - j11_cqlsh_dtests_py3:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j8_build
-     - j11_cqlsh-dtests-py38-no-vnodes:
++    - j11_cqlsh_dtests_py38:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j8_build
-     - start_j8_repeated_utest:
-         type: approval
-     - j8_repeated_utest:
-         requires:
-         - start_j8_repeated_utest
-         - j8_build
-     - start_j11_repeated_utest:
-         type: approval
-     - j11_repeated_utest:
-         requires:
-         - start_j11_repeated_utest
-         - j8_build
-     - start_j8_repeated_dtest:
-         type: approval
-     - j8_repeated_dtest:
-         requires:
-         - start_j8_repeated_dtest
-         - j8_build
-     - start_j11_repeated_dtest:
-         type: approval
-     - j11_repeated_dtest:
-         requires:
-         - start_j11_repeated_dtest
-         - j8_build
-     - start_repeated_upgrade_dtest:
-         type: approval
-     - repeated_upgrade_dtest:
-         requires:
-         - start_repeated_upgrade_dtest
-         - j8_build
-     - start_repeated_jvm_upgrade_dtest:
-         type: approval
-     - repeated_jvm_upgrade_dtest:
-         requires:
-         - start_repeated_jvm_upgrade_dtest
-         - j8_dtest_jars_build
 +  java8_pre-commit_tests:
      jobs:
      - start_pre-commit_tests:
          type: approval
@@@ -4085,246 -2764,25 +6148,185 @@@
      - utests_stress:
          requires:
          - start_utests_stress
 -        - build
 +        - j8_build
 +    - start_utests_fqltool:
 +        type: approval
 +    - utests_fqltool:
 +        requires:
 +        - start_utests_fqltool
 +        - j8_build
 +    - utests_system_keyspace_directory:
 +        requires:
 +        - j8_build
-     - start_j8_dtest_jars_build:
+     - start_jvm_upgrade_dtests:
          type: approval
      - j8_dtest_jars_build:
          requires:
 -        - build
 +        - j8_build
-         - start_j8_dtest_jars_build
-     - start_jvm_upgrade_dtest:
-         type: approval
+         - start_jvm_upgrade_dtests
      - j8_jvm_upgrade_dtests:
          requires:
-         - start_jvm_upgrade_dtest
          - j8_dtest_jars_build
-     - j8_dtests-with-vnodes:
+     - j8_dtests:
          requires:
 -        - build
 +        - j8_build
-     - j8_dtests-no-vnodes:
+     - j8_dtests_vnode:
          requires:
 -        - build
 +        - j8_build
-     - j11_dtests-with-vnodes:
++    - j11_dtests:
 +        requires:
 +        - j8_build
-     - j11_dtests-no-vnodes:
++    - j11_dtests_vnode:
 +        requires:
 +        - j8_build
      - start_upgrade_tests:
          type: approval
-     - j8_upgradetests-no-vnodes:
+     - j8_upgrade_dtests:
          requires:
 +        - j8_build
          - start_upgrade_tests
 -        - build
 +    - j8_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +        - j8_build
-     - j8_cqlsh-dtests-py3-with-vnodes:
++    - j8_cqlsh_dtests_py3_vnode:
 +        requires:
 +        - j8_build
-     - j8_cqlsh-dtests-py38-with-vnodes:
++    - j8_cqlsh_dtests_py38_vnode:
 +        requires:
 +        - j8_build
 +    - j8_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +        - j8_build
-     - j8_cqlsh-dtests-py3-no-vnodes:
++    - j8_cqlsh_dtests_py3:
 +        requires:
 +        - j8_build
-     - j8_cqlsh-dtests-py38-no-vnodes:
++    - j8_cqlsh_dtests_py38:
 +        requires:
 +        - j8_build
 +    - j11_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +        - j8_build
-     - j11_cqlsh-dtests-py3-with-vnodes:
++    - j11_cqlsh_dtests_py3_vnode:
 +        requires:
 +        - j8_build
-     - j11_cqlsh-dtests-py38-with-vnodes:
++    - j11_cqlsh_dtests_py38_vnode:
 +        requires:
 +        - j8_build
 +    - j11_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +        - j8_build
-     - j11_cqlsh-dtests-py3-no-vnodes:
++    - j11_cqlsh_dtests_py3:
 +        requires:
 +        - j8_build
-     - j11_cqlsh-dtests-py38-no-vnodes:
++    - j11_cqlsh_dtests_py38:
 +        requires:
 +        - j8_build
-     - start_j8_repeated_utest:
-         type: approval
-     - j8_repeated_utest:
-         requires:
-         - start_j8_repeated_utest
-         - j8_build
-     - start_j11_repeated_utest:
-         type: approval
-     - j11_repeated_utest:
-         requires:
-         - start_j11_repeated_utest
-         - j8_build
-     - start_j8_repeated_dtest:
-         type: approval
-     - j8_repeated_dtest:
-         requires:
-         - start_j8_repeated_dtest
-         - j8_build
-     - start_j11_repeated_dtest:
-         type: approval
-     - j11_repeated_dtest:
-         requires:
-         - start_j11_repeated_dtest
-         - j8_build
-     - start_repeated_upgrade_dtest:
-         type: approval
-     - repeated_upgrade_dtest:
-         requires:
-         - start_repeated_upgrade_dtest
-         - j8_build
-     - start_repeated_jvm_upgrade_dtest:
-         type: approval
-     - repeated_jvm_upgrade_dtest:
-         requires:
-         - start_repeated_jvm_upgrade_dtest
-         - j8_dtest_jars_build
 +  java11_separate_tests:
 +    jobs:
 +    - start_j11_build:
 +        type: approval
 +    - j11_build:
 +        requires:
 +        - start_j11_build
 +    - start_j11_unit_tests:
 +        type: approval
 +    - j11_unit_tests:
 +        requires:
 +        - start_j11_unit_tests
 +        - j11_build
 +    - start_j11_jvm_dtests:
 +        type: approval
 +    - j11_jvm_dtests:
 +        requires:
 +        - start_j11_jvm_dtests
 +        - j11_build
 +    - start_j11_cqlshlib_tests:
 +        type: approval
 +    - j11_cqlshlib_tests:
 +        requires:
 +        - start_j11_cqlshlib_tests
 +        - j11_build
 +    - start_j11_dtests:
 +        type: approval
-     - j11_dtests-with-vnodes:
++    - j11_dtests:
 +        requires:
 +        - start_j11_dtests
 +        - j11_build
-     - j11_dtests-no-vnodes:
++    - start_j11_dtests_vnode:
++        type: approval
++    - j11_dtests_vnode:
 +        requires:
-         - start_j11_dtests
++        - start_j11_dtests_vnode
 +        - j11_build
 +    - start_j11_cqlsh_tests:
 +        type: approval
 +    - j11_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j11_build
-     - j11_cqlsh-dtests-py3-with-vnodes:
++    - j11_cqlsh_dtests_py3_vnode:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j11_build
-     - j11_cqlsh-dtests-py38-with-vnodes:
++    - j11_cqlsh_dtests_py38_vnode:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j11_build
 +    - j11_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j11_build
-     - j11_cqlsh-dtests-py3-no-vnodes:
++    - j11_cqlsh_dtests_py3:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j11_build
-     - j11_cqlsh-dtests-py38-no-vnodes:
++    - j11_cqlsh_dtests_py38:
 +        requires:
 +        - start_j11_cqlsh_tests
 +        - j11_build
-     - start_j11_repeated_utest:
-         type: approval
-     - j11_repeated_utest:
-         requires:
-         - start_j11_repeated_utest
-         - j11_build
-     - start_j11_repeated_dtest:
-         type: approval
-     - j11_repeated_dtest:
-         requires:
-         - start_j11_repeated_dtest
-         - j11_build
 +  java11_pre-commit_tests:
 +    jobs:
 +    - start_pre-commit_tests:
 +        type: approval
 +    - j11_build:
 +        requires:
 +        - start_pre-commit_tests
 +    - j11_unit_tests:
 +        requires:
 +        - j11_build
 +    - j11_jvm_dtests:
 +        requires:
 +        - j11_build
 +    - j11_cqlshlib_tests:
 +        requires:
 +        - j11_build
 +    - j11_jvm_dtests:
 +        requires:
 +        - j11_build
 +    - j11_cqlshlib_tests:
 +        requires:
 +        - j11_build
-     - j11_dtests-with-vnodes:
++    - j11_dtests:
 +        requires:
 +        - j11_build
-     - j11_dtests-no-vnodes:
++    - j11_dtests_vnode:
 +        requires:
 +        - j11_build
 +    - j11_cqlsh-dtests-py2-with-vnodes:
 +        requires:
 +        - j11_build
-     - j11_cqlsh-dtests-py3-with-vnodes:
++    - j11_cqlsh_dtests_py3_vnode:
 +        requires:
 +        - j11_build
-     - j11_cqlsh-dtests-py38-with-vnodes:
++    - j11_cqlsh_dtests_py38_vnode:
 +        requires:
 +        - j11_build
 +    - j11_cqlsh-dtests-py2-no-vnodes:
 +        requires:
 +        - j11_build
-     - j11_cqlsh-dtests-py3-no-vnodes:
-         requires:
-         - j11_build
-     - j11_cqlsh-dtests-py38-no-vnodes:
++    - j11_cqlsh_dtests_py3:
 +        requires:
 +        - j11_build
-     - start_j11_repeated_utest:
-         type: approval
-     - j11_repeated_utest:
-         requires:
-         - start_j11_repeated_utest
-         - j11_build
-     - start_j11_repeated_dtest:
-         type: approval
-     - j11_repeated_dtest:
++    - j11_cqlsh_dtests_py38:
 +        requires:
-         - start_j11_repeated_dtest
 +        - j11_build
diff --cc .circleci/config.yml.HIGHRES
index 3b71be7b4b,b832815cc3..5df1b2f7be
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@@ -107,27 -106,30 +107,32 @@@ jobs
      - CASSANDRA_SKIP_SYNC: true
      - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
      - DTEST_BRANCH: trunk
 -    - CCM_MAX_HEAP_SIZE: 2048M
 -    - CCM_HEAP_NEWSIZE: 512M
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-   repeated_jvm_upgrade_dtest:
+   utests_compression_repeat:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
      resource_class: xlarge
@@@ -200,10 -201,12 +204,13 @@@
                if [[ $target == "test" || \
                      $target == "test-cdc" || \
                      $target == "test-compression" || \
-                     $target == "test-system-keyspace-directory" ]]; then
-                 name="-Dtest.name=$class_name"
+                     $target == "test-system-keyspace-directory" || \
++                    $target == "fqltool-test" || \
+                     $target == "long-test" || \
+                     $target == "stress-test" ]]; then
+                 name_arg="-Dtest.name=${class##*.}"
                else
-                 name="-Dtest.name=$class_path"
+                 name_arg="-Dtest.name=$class"
                fi
  
                # Prepare the -Dtest.methods argument, which is optional
@@@ -253,25 -255,22 +259,23 @@@
                    break
                  fi
                done
- 
-               (exit ${exit_code})
-             fi
-           fi
+           done
+           (exit ${exit_code})
      - store_test_results:
-         path: /tmp/results/repeated_utest/output
+         path: /tmp/results/repeated_utests/output
      - store_artifacts:
-         path: /tmp/results/repeated_utest/stdout
+         path: /tmp/results/repeated_utests/stdout
          destination: stdout
      - store_artifacts:
-         path: /tmp/results/repeated_utest/output
+         path: /tmp/results/repeated_utests/output
          destination: junitxml
      - store_artifacts:
-         path: /tmp/results/repeated_utest/logs
+         path: /tmp/results/repeated_utests/logs
          destination: logs
      environment:
 -    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - ANT_HOME: /usr/share/ant
 +    - JAVA11_HOME: /usr/lib/jvm/java-11-openjdk-amd64
 +    - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - LANG: en_US.UTF-8
      - KEEP_TEST_DIR: true
      - DEFAULT_DIR: /home/cassandra/cassandra-dtest
@@@ -282,27 -281,30 +286,32 @@@
      - CASSANDRA_SKIP_SYNC: true
      - DTEST_REPO: https://github.com/apache/cassandra-dtest.git
      - DTEST_BRANCH: trunk
 -    - CCM_MAX_HEAP_SIZE: 2048M
 -    - CCM_HEAP_NEWSIZE: 512M
 +    - CCM_MAX_HEAP_SIZE: 1024M
 +    - CCM_HEAP_NEWSIZE: 256M
-     - REPEATED_UTEST_TARGET: testsome
-     - REPEATED_UTEST_CLASS: null
-     - REPEATED_UTEST_METHODS: null
-     - REPEATED_UTEST_COUNT: 100
-     - REPEATED_UTEST_STOP_ON_FAILURE: false
-     - REPEATED_DTEST_NAME: null
-     - REPEATED_DTEST_VNODES: false
-     - REPEATED_DTEST_COUNT: 100
-     - REPEATED_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_UPGRADE_DTEST_NAME: null
-     - REPEATED_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_UPGRADE_DTEST_STOP_ON_FAILURE: false
-     - REPEATED_JVM_UPGRADE_DTEST_CLASS: null
-     - REPEATED_JVM_UPGRADE_DTEST_METHODS: null
-     - REPEATED_JVM_UPGRADE_DTEST_COUNT: 100
-     - REPEATED_JVM_UPGRADE_DTEST_STOP_ON_FAILURE: false
+     - REPEATED_TESTS_STOP_ON_FAILURE: false
+     - REPEATED_UTESTS: null
+     - REPEATED_UTESTS_COUNT: 500
++    - REPEATED_UTESTS_FQLTOOL: null
++    - REPEATED_UTESTS_FQLTOOL_COUNT: 500
+     - REPEATED_UTESTS_LONG: null
+     - REPEATED_UTESTS_LONG_COUNT: 100
+     - REPEATED_UTESTS_STRESS: null
+     - REPEATED_UTESTS_STRESS_COUNT: 500
+     - REPEATED_JVM_DTESTS: null
+     - REPEATED_JVM_DTESTS_COUNT: 500
+     - REPEATED_JVM_UPGRADE_DTESTS: null
+     - REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500
+     - REPEATED_DTESTS: null
+     - REPEATED_DTESTS_COUNT: 500
+     - REPEATED_UPGRADE_DTESTS: null
+     - REPEATED_UPGRADE_DTESTS_COUNT: 25
+     - REPEATED_ANT_TEST_TARGET: testsome
+     - REPEATED_ANT_TEST_CLASS: null
+     - REPEATED_ANT_TEST_METHODS: null
+     - REPEATED_ANT_TEST_COUNT: 500
      - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
      - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
 -  utests_stress_repeat:
 +  j8_cqlsh-dtests-py2-with-vnodes:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
      resource_class: xlarge
@@@ -310,122 -312,8 +319,108 @@@
      shell: /bin/bash -eo pipefail -l
      parallelism: 100
      steps:
 +    - attach_workspace:
 +        at: /home/cassandra
 +    - run:
 +        name: Clone Cassandra dtest Repository (via git)
 +        command: |
 +          git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
 +    - run:
 +        name: Configure virtualenv and python Dependencies
 +        command: |
 +          # note, this should be super quick as all dependencies should be pre-installed in the docker image
 +          # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
 +          # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
 +          # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
 +          source ~/env3.6/bin/activate
 +          export PATH=$JAVA_HOME/bin:$PATH
 +          pip3 install --exists-action w --upgrade -r ~/cassandra-dtest/requirements.txt
 +          pip3 uninstall -y cqlsh
 +          pip3 freeze
 +    - run:
 +        name: Determine Tests to Run (j8_with_vnodes)
 +        no_output_timeout: 5m
 +        command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n  export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
 +    - run:
 +        name: Run dtests (j8_with_vnodes)
 +        no_output_timeout: 15m
 +        command: |
 +          echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
... 24708 lines suppressed ...


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