CircleCI: Add separate approval step for oa utests on separate workflows

patch by Andrés de la Peña; reviewed by Berenguer Blasi for CASSANDRA-18593
2023-06-13 13:17:21 +01:00 · 2023-06-13 13:17:21 +01:00 · 83a3316246
parent c7260399d6
commit 83a3316246
10 changed files with 224 additions and 176 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -10336,10 +10336,6 @@ workflows:
        requires:
        - start_j8_unit_tests
        - j8_build
-    - j8_utests_oa:
-        requires:
-        - start_j8_unit_tests
-        - j8_build
    - start_j8_jvm_dtests:
        type: approval
    - j8_jvm_dtests:
@ -10400,9 +10396,17 @@ workflows:
        requires:
        - start_j11_unit_tests
        - j8_build
+    - start_j8_utests_oa:
+        type: approval
+    - j8_utests_oa:
+        requires:
+        - start_j8_utests_oa
+        - j8_build
+    - start_j11_utests_oa:
+        type: approval
    - j11_utests_oa:
        requires:
-        - start_j11_unit_tests
+        - start_j11_utests_oa
        - j8_build
    - start_j8_utests_long:
        type: approval
@ -10864,10 +10868,6 @@ workflows:
        requires:
        - start_j11_unit_tests
        - j11_build
-    - j11_utests_oa:
-        requires:
-        - start_j11_unit_tests
-        - j11_build
    - start_j11_jvm_dtests:
        type: approval
    - j11_jvm_dtests:
@ -10968,6 +10968,12 @@ workflows:
        requires:
        - start_j11_cqlsh-dtests-offheap
        - j11_build
+    - start_j11_utests_oa:
+        type: approval
+    - j11_utests_oa:
+        requires:
+        - start_j11_utests_oa
+        - j11_build
    - start_j11_utests_long:
        type: approval
    - j11_utests_long:
--- a/.circleci/config.yml.FREE
+++ b/.circleci/config.yml.FREE
@ -10336,10 +10336,6 @@ workflows:
        requires:
        - start_j8_unit_tests
        - j8_build
-    - j8_utests_oa:
-        requires:
-        - start_j8_unit_tests
-        - j8_build
    - start_j8_jvm_dtests:
        type: approval
    - j8_jvm_dtests:
@ -10400,9 +10396,17 @@ workflows:
        requires:
        - start_j11_unit_tests
        - j8_build
+    - start_j8_utests_oa:
+        type: approval
+    - j8_utests_oa:
+        requires:
+        - start_j8_utests_oa
+        - j8_build
+    - start_j11_utests_oa:
+        type: approval
    - j11_utests_oa:
        requires:
-        - start_j11_unit_tests
+        - start_j11_utests_oa
        - j8_build
    - start_j8_utests_long:
        type: approval
@ -10864,10 +10868,6 @@ workflows:
        requires:
        - start_j11_unit_tests
        - j11_build
-    - j11_utests_oa:
-        requires:
-        - start_j11_unit_tests
-        - j11_build
    - start_j11_jvm_dtests:
        type: approval
    - j11_jvm_dtests:
@ -10968,6 +10968,12 @@ workflows:
        requires:
        - start_j11_cqlsh-dtests-offheap
        - j11_build
+    - start_j11_utests_oa:
+        type: approval
+    - j11_utests_oa:
+        requires:
+        - start_j11_utests_oa
+        - j11_build
    - start_j11_utests_long:
        type: approval
    - j11_utests_long:
--- a/.circleci/config.yml.PAID
+++ b/.circleci/config.yml.PAID
@ -10336,10 +10336,6 @@ workflows:
        requires:
        - start_j8_unit_tests
        - j8_build
-    - j8_utests_oa:
-        requires:
-        - start_j8_unit_tests
-        - j8_build
    - start_j8_jvm_dtests:
        type: approval
    - j8_jvm_dtests:
@ -10400,9 +10396,17 @@ workflows:
        requires:
        - start_j11_unit_tests
        - j8_build
+    - start_j8_utests_oa:
+        type: approval
+    - j8_utests_oa:
+        requires:
+        - start_j8_utests_oa
+        - j8_build
+    - start_j11_utests_oa:
+        type: approval
    - j11_utests_oa:
        requires:
-        - start_j11_unit_tests
+        - start_j11_utests_oa
        - j8_build
    - start_j8_utests_long:
        type: approval
@ -10864,10 +10868,6 @@ workflows:
        requires:
        - start_j11_unit_tests
        - j11_build
-    - j11_utests_oa:
-        requires:
-        - start_j11_unit_tests
-        - j11_build
    - start_j11_jvm_dtests:
        type: approval
    - j11_jvm_dtests:
@ -10968,6 +10968,12 @@ workflows:
        requires:
        - start_j11_cqlsh-dtests-offheap
        - j11_build
+    - start_j11_utests_oa:
+        type: approval
+    - j11_utests_oa:
+        requires:
+        - start_j11_utests_oa
+        - j11_build
    - start_j11_utests_long:
        type: approval
    - j11_utests_long:
--- a/.circleci/config_11_and_17.yml
+++ b/.circleci/config_11_and_17.yml
@ -10134,10 +10134,6 @@ workflows:
        requires:
        - start_j11_unit_tests
        - j11_build
-    - j11_utests_oa:
-        requires:
-        - start_j11_unit_tests
-        - j11_build
    - start_j11_jvm_dtests:
        type: approval
    - j11_jvm_dtests:
@ -10198,9 +10194,17 @@ workflows:
        requires:
        - start_j17_unit_tests
        - j11_build
+    - start_j11_utests_oa:
+        type: approval
+    - j11_utests_oa:
+        requires:
+        - start_j11_utests_oa
+        - j11_build
+    - start_j17_utests_oa:
+        type: approval
    - j17_utests_oa:
        requires:
-        - start_j17_unit_tests
+        - start_j17_utests_oa
        - j11_build
    - start_j11_utests_long:
        type: approval
@ -10695,10 +10699,6 @@ workflows:
        requires:
        - start_j17_unit_tests
        - j17_build
-    - j17_utests_oa:
-        requires:
-        - start_j17_unit_tests
-        - j17_build
    - start_j17_jvm_dtests:
        type: approval
    - j17_jvm_dtests:
@ -10793,6 +10793,12 @@ workflows:
        requires:
        - start_j17_cqlsh-dtests-offheap
        - j17_build
+    - start_j17_utests_oa:
+        type: approval
+    - j17_utests_oa:
+        requires:
+        - start_j17_utests_oa
+        - j17_build
    - start_j17_utests_long:
        type: approval
    - j17_utests_long:
--- a/.circleci/config_11_and_17.yml.FREE
+++ b/.circleci/config_11_and_17.yml.FREE
@ -10134,10 +10134,6 @@ workflows:
        requires:
        - start_j11_unit_tests
        - j11_build
-    - j11_utests_oa:
-        requires:
-        - start_j11_unit_tests
-        - j11_build
    - start_j11_jvm_dtests:
        type: approval
    - j11_jvm_dtests:
@ -10198,9 +10194,17 @@ workflows:
        requires:
        - start_j17_unit_tests
        - j11_build
+    - start_j11_utests_oa:
+        type: approval
+    - j11_utests_oa:
+        requires:
+        - start_j11_utests_oa
+        - j11_build
+    - start_j17_utests_oa:
+        type: approval
    - j17_utests_oa:
        requires:
-        - start_j17_unit_tests
+        - start_j17_utests_oa
        - j11_build
    - start_j11_utests_long:
        type: approval
@ -10695,10 +10699,6 @@ workflows:
        requires:
        - start_j17_unit_tests
        - j17_build
-    - j17_utests_oa:
-        requires:
-        - start_j17_unit_tests
-        - j17_build
    - start_j17_jvm_dtests:
        type: approval
    - j17_jvm_dtests:
@ -10793,6 +10793,12 @@ workflows:
        requires:
        - start_j17_cqlsh-dtests-offheap
        - j17_build
+    - start_j17_utests_oa:
+        type: approval
+    - j17_utests_oa:
+        requires:
+        - start_j17_utests_oa
+        - j17_build
    - start_j17_utests_long:
        type: approval
    - j17_utests_long:
--- a/.circleci/config_11_and_17.yml.PAID
+++ b/.circleci/config_11_and_17.yml.PAID
@ -10134,10 +10134,6 @@ workflows:
        requires:
        - start_j11_unit_tests
        - j11_build
-    - j11_utests_oa:
-        requires:
-        - start_j11_unit_tests
-        - j11_build
    - start_j11_jvm_dtests:
        type: approval
    - j11_jvm_dtests:
@ -10198,9 +10194,17 @@ workflows:
        requires:
        - start_j17_unit_tests
        - j11_build
+    - start_j11_utests_oa:
+        type: approval
+    - j11_utests_oa:
+        requires:
+        - start_j11_utests_oa
+        - j11_build
+    - start_j17_utests_oa:
+        type: approval
    - j17_utests_oa:
        requires:
-        - start_j17_unit_tests
+        - start_j17_utests_oa
        - j11_build
    - start_j11_utests_long:
        type: approval
@ -10695,10 +10699,6 @@ workflows:
        requires:
        - start_j17_unit_tests
        - j17_build
-    - j17_utests_oa:
-        requires:
-        - start_j17_unit_tests
-        - j17_build
    - start_j17_jvm_dtests:
        type: approval
    - j17_jvm_dtests:
@ -10793,6 +10793,12 @@ workflows:
        requires:
        - start_j17_cqlsh-dtests-offheap
        - j17_build
+    - start_j17_utests_oa:
+        type: approval
+    - j17_utests_oa:
+        requires:
+        - start_j17_utests_oa
+        - j17_build
    - start_j17_utests_long:
        type: approval
    - j17_utests_long:
--- a/.circleci/config_template.yml
+++ b/.circleci/config_template.yml
@ -258,22 +258,6 @@ j8_separate_jobs: &j8_separate_jobs
        requires:
          - start_j8_unit_tests
          - j8_build
-    - j8_utests_oa:
-        requires:
-          - start_j8_unit_tests
-          - j8_build
-    - start_j8_utests_oa_repeat:
-        type: approval
-    - j8_utests_oa_repeat:
-        requires:
-          - start_j8_utests_oa_repeat
-          - j8_build
-    - start_j11_utests_oa_repeat:
-        type: approval
-    - j11_utests_oa_repeat:
-        requires:
-          - start_j11_utests_oa_repeat
-          - j8_build
    - start_j8_unit_tests_repeat:
        type: approval
    - j8_unit_tests_repeat:
@ -371,10 +355,6 @@ j8_separate_jobs: &j8_separate_jobs
        requires:
          - start_j11_unit_tests
          - j8_build
-    - j11_utests_oa:
-        requires:
-          - start_j11_unit_tests
-          - j8_build
    - start_j11_unit_tests_repeat:
        type: approval
    - j11_unit_tests_repeat:
@ -382,6 +362,30 @@ j8_separate_jobs: &j8_separate_jobs
          - start_j11_unit_tests_repeat
          - j8_build
    # specialized unit tests (all run on request)
+    - start_j8_utests_oa:
+        type: approval
+    - j8_utests_oa:
+        requires:
+          - start_j8_utests_oa
+          - j8_build
+    - start_j8_utests_oa_repeat:
+        type: approval
+    - j8_utests_oa_repeat:
+        requires:
+          - start_j8_utests_oa_repeat
+          - j8_build
+    - start_j11_utests_oa:
+        type: approval
+    - j11_utests_oa:
+        requires:
+          - start_j11_utests_oa
+          - j8_build
+    - start_j11_utests_oa_repeat:
+        type: approval
+    - j11_utests_oa_repeat:
+        requires:
+          - start_j11_utests_oa_repeat
+          - j8_build
    - start_j8_utests_long:
        type: approval
    - j8_utests_long:
@ -1142,16 +1146,6 @@ j11_separate_jobs: &j11_separate_jobs
        requires:
          - start_j11_unit_tests
          - j11_build
-    - j11_utests_oa:
-        requires:
-          - start_j11_unit_tests
-          - j11_build
-    - start_j11_utests_oa_repeat:
-        type: approval
-    - j11_utests_oa_repeat:
-        requires:
-          - start_j11_utests_oa_repeat
-          - j11_build
    - start_j11_unit_tests_repeat:
        type: approval
    - j11_unit_tests_repeat:
@ -1296,6 +1290,18 @@ j11_separate_jobs: &j11_separate_jobs
          - start_j11_cqlsh-dtests-offheap
          - j11_build
    # specialized unit tests (all run on request)
+    - start_j11_utests_oa:
+        type: approval
+    - j11_utests_oa:
+        requires:
+          - start_j11_utests_oa
+          - j11_build
+    - start_j11_utests_oa_repeat:
+        type: approval
+    - j11_utests_oa_repeat:
+        requires:
+          - start_j11_utests_oa_repeat
+          - j11_build
    - start_j11_utests_long:
        type: approval
    - j11_utests_long:
--- a/.circleci/config_template.yml.PAID.patch
+++ b/.circleci/config_template.yml.PAID.patch
@ -1,5 +1,5 @@
--- config_template.yml	2023-06-06 17:25:41.000000000 -0400
-+++ config_template.yml.PAID	2023-06-06 17:28:54.000000000 -0400
+--- config_template.yml	2023-06-16 12:35:53.260639863 +0100
+++ config_template.yml.PAID	2023-06-16 12:37:27.215497973 +0100
@@ -157,14 +157,14 @@
 j8_par_executor: &j8_par_executor
   executor:
@ -134,7 +134,7 @@
 
 j8_separate_jobs: &j8_separate_jobs
   jobs:
-@@ -2000,7 +2024,7 @@
+@@ -2006,7 +2030,7 @@
           target: testclasslist-system-keyspace-directory
 
   j8_dtests_vnode:
@ -143,7 +143,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2014,7 +2038,7 @@
+@@ -2020,7 +2044,7 @@
           pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 
   j8_dtests_offheap:
@ -152,7 +152,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2028,7 +2052,7 @@
+@@ -2034,7 +2058,7 @@
           pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
 
   j11_dtests_vnode:
@ -161,7 +161,7 @@
     steps:
     - attach_workspace:
         at: /home/cassandra
-@@ -2043,7 +2067,7 @@
+@@ -2049,7 +2073,7 @@
         pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 
   j11_dtests_offheap:
@ -170,7 +170,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2058,7 +2082,7 @@
+@@ -2064,7 +2088,7 @@
           pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
 
   j8_dtests:
@ -179,7 +179,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2072,7 +2096,7 @@
+@@ -2078,7 +2102,7 @@
           pytest_extra_args: '--skip-resource-intensive-tests'
 
   j11_dtests:
@ -188,7 +188,7 @@
     steps:
     - attach_workspace:
         at: /home/cassandra
-@@ -2087,7 +2111,7 @@
+@@ -2093,7 +2117,7 @@
         pytest_extra_args: '--skip-resource-intensive-tests'
 
   j11_upgrade_dtests:
@ -197,7 +197,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2101,7 +2125,7 @@
+@@ -2107,7 +2131,7 @@
           pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
 
   j8_cqlsh_dtests_py3_vnode:
@ -206,7 +206,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2116,7 +2140,7 @@
+@@ -2122,7 +2146,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j8_cqlsh_dtests_py3_offheap:
@ -215,7 +215,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2131,7 +2155,7 @@
+@@ -2137,7 +2161,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j8_cqlsh_dtests_py38_vnode:
@ -224,7 +224,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2149,7 +2173,7 @@
+@@ -2155,7 +2179,7 @@
           python_version: '3.8'
 
   j8_cqlsh_dtests_py311_vnode:
@ -233,7 +233,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2167,7 +2191,7 @@
+@@ -2173,7 +2197,7 @@
           python_version: '3.11'
 
   j8_cqlsh_dtests_py38_offheap:
@ -242,7 +242,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2185,7 +2209,7 @@
+@@ -2191,7 +2215,7 @@
           python_version: '3.8'
 
   j8_cqlsh_dtests_py311_offheap:
@ -251,7 +251,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2203,7 +2227,7 @@
+@@ -2209,7 +2233,7 @@
           python_version: '3.11'
 
   j8_cqlsh_dtests_py3:
@ -260,7 +260,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2218,7 +2242,7 @@
+@@ -2224,7 +2248,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j8_cqlsh_dtests_py38:
@ -269,7 +269,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2236,7 +2260,7 @@
+@@ -2242,7 +2266,7 @@
           python_version: '3.8'
 
   j8_cqlsh_dtests_py311:
@ -278,7 +278,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2254,7 +2278,7 @@
+@@ -2260,7 +2284,7 @@
           python_version: '3.11'
 
   j11_cqlsh_dtests_py3_vnode:
@ -287,7 +287,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2269,7 +2293,7 @@
+@@ -2275,7 +2299,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j11_cqlsh_dtests_py3_offheap:
@ -296,7 +296,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2284,7 +2308,7 @@
+@@ -2290,7 +2314,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j11_cqlsh_dtests_py38_vnode:
@ -305,7 +305,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2302,7 +2326,7 @@
+@@ -2308,7 +2332,7 @@
           python_version: '3.8'
 
   j11_cqlsh_dtests_py311_vnode:
@ -314,7 +314,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2320,7 +2344,7 @@
+@@ -2326,7 +2350,7 @@
           python_version: '3.11'
 
   j11_cqlsh_dtests_py38_offheap:
@ -323,7 +323,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2338,7 +2362,7 @@
+@@ -2344,7 +2368,7 @@
           python_version: '3.8'
 
   j11_cqlsh_dtests_py311_offheap:
@ -332,7 +332,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2356,7 +2380,7 @@
+@@ -2362,7 +2386,7 @@
           python_version: '3.11'
 
   j11_cqlsh_dtests_py3:
@ -341,7 +341,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2371,7 +2395,7 @@
+@@ -2377,7 +2401,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j11_cqlsh_dtests_py38:
@ -350,7 +350,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2389,7 +2413,7 @@
+@@ -2395,7 +2419,7 @@
           python_version: '3.8'
 
   j11_cqlsh_dtests_py311:
@ -359,7 +359,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2407,7 +2431,7 @@
+@@ -2413,7 +2437,7 @@
           python_version: '3.11'
 
   j8_dtests_large_vnode:
@ -368,7 +368,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2421,7 +2445,7 @@
+@@ -2427,7 +2451,7 @@
           pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
 
   j8_dtests_large:
@ -377,7 +377,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2435,7 +2459,7 @@
+@@ -2441,7 +2465,7 @@
           pytest_extra_args: '--only-resource-intensive-tests --force-resource-intensive-tests'
 
   j11_dtests_large_vnode:
@ -386,7 +386,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2449,7 +2473,7 @@
+@@ -2455,7 +2479,7 @@
           pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
 
   j11_dtests_large:
--- a/.circleci/config_template_11_and_17.yml
+++ b/.circleci/config_template_11_and_17.yml
@ -259,22 +259,6 @@ j11_separate_jobs: &j11_separate_jobs
        requires:
          - start_j11_unit_tests
          - j11_build
-    - j11_utests_oa:
-        requires:
-          - start_j11_unit_tests
-          - j11_build
-    - start_j11_utests_oa_repeat:
-        type: approval
-    - j11_utests_oa_repeat:
-        requires:
-          - start_j11_utests_oa_repeat
-          - j11_build
-    - start_j17_utests_oa_repeat:
-        type: approval
-    - j17_utests_oa_repeat:
-        requires:
-          - start_j17_utests_oa_repeat
-          - j11_build
    - start_j11_unit_tests_repeat:
        type: approval
    - j11_unit_tests_repeat:
@ -372,10 +356,6 @@ j11_separate_jobs: &j11_separate_jobs
        requires:
          - start_j17_unit_tests
          - j11_build
-    - j17_utests_oa:
-        requires:
-          - start_j17_unit_tests
-          - j11_build
    - start_j17_unit_tests_repeat:
        type: approval
    - j17_unit_tests_repeat:
@ -383,6 +363,30 @@ j11_separate_jobs: &j11_separate_jobs
          - start_j17_unit_tests_repeat
          - j11_build
    # specialized unit tests (all run on request)
+    - start_j11_utests_oa:
+        type: approval
+    - j11_utests_oa:
+        requires:
+          - start_j11_utests_oa
+          - j11_build
+    - start_j11_utests_oa_repeat:
+        type: approval
+    - j11_utests_oa_repeat:
+        requires:
+          - start_j11_utests_oa_repeat
+          - j11_build
+    - start_j17_utests_oa:
+        type: approval
+    - j17_utests_oa:
+        requires:
+          - start_j17_utests_oa
+          - j11_build
+    - start_j17_utests_oa_repeat:
+        type: approval
+    - j17_utests_oa_repeat:
+        requires:
+          - start_j17_utests_oa_repeat
+          - j11_build
    - start_j11_utests_long:
        type: approval
    - j11_utests_long:
@ -1200,16 +1204,6 @@ j17_separate_jobs: &j17_separate_jobs
        requires:
          - start_j17_unit_tests
          - j17_build
-    - j17_utests_oa:
-        requires:
-          - start_j17_unit_tests
-          - j17_build
-    - start_j17_utests_oa_repeat:
-        type: approval
-    - j17_utests_oa_repeat:
-        requires:
-          - start_j17_utests_oa_repeat
-          - j17_build
    - start_j17_unit_tests_repeat:
        type: approval
    - j17_unit_tests_repeat:
@ -1342,6 +1336,18 @@ j17_separate_jobs: &j17_separate_jobs
          - start_j17_cqlsh-dtests-offheap
          - j17_build
    # specialized unit tests (all run on request)
+    - start_j17_utests_oa:
+        type: approval
+    - j17_utests_oa:
+        requires:
+          - start_j17_utests_oa
+          - j17_build
+    - start_j17_utests_oa_repeat:
+        type: approval
+    - j17_utests_oa_repeat:
+        requires:
+          - start_j17_utests_oa_repeat
+          - j17_build
    - start_j17_utests_long:
        type: approval
    - j17_utests_long:
--- a/.circleci/config_template_11_and_17.yml.PAID.patch
+++ b/.circleci/config_template_11_and_17.yml.PAID.patch
@ -1,5 +1,5 @@
--- config_template_11_and_17.yml	2023-06-09 19:10:52.000000000 -0400
-+++ config_template_11_and_17.yml.PAID	2023-06-09 19:34:32.000000000 -0400
+--- config_template_11_and_17.yml	2023-06-16 12:35:53.262925452 +0100
+++ config_template_11_and_17.yml.PAID	2023-06-16 12:38:27.607627603 +0100
@@ -157,14 +157,14 @@
 j11_par_executor: &j11_par_executor
   executor:
@ -134,7 +134,7 @@
 
 j11_separate_jobs: &j11_separate_jobs
   jobs:
-@@ -1974,7 +1997,7 @@
+@@ -1980,7 +2003,7 @@
           target: testclasslist-system-keyspace-directory
 
   j11_dtests_vnode:
@ -143,7 +143,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -1988,7 +2011,7 @@
+@@ -1994,7 +2017,7 @@
           pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 
   j11_dtests_offheap:
@ -152,7 +152,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2002,7 +2025,7 @@
+@@ -2008,7 +2031,7 @@
           pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
 
   j17_dtests_vnode:
@ -161,7 +161,7 @@
     steps:
     - attach_workspace:
         at: /home/cassandra
-@@ -2017,7 +2040,7 @@
+@@ -2023,7 +2046,7 @@
         pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
 
   j17_dtests_offheap:
@ -170,7 +170,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2032,7 +2055,7 @@
+@@ -2038,7 +2061,7 @@
           pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
 
   j11_dtests:
@ -179,7 +179,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2046,7 +2069,7 @@
+@@ -2052,7 +2075,7 @@
           pytest_extra_args: '--skip-resource-intensive-tests'
 
   j17_dtests:
@ -188,7 +188,7 @@
     steps:
     - attach_workspace:
         at: /home/cassandra
-@@ -2061,7 +2084,7 @@
+@@ -2067,7 +2090,7 @@
         pytest_extra_args: '--skip-resource-intensive-tests'
 
   j11_upgrade_dtests:
@ -197,7 +197,7 @@
     steps:
     - attach_workspace:
         at: /home/cassandra
-@@ -2075,7 +2098,7 @@
+@@ -2081,7 +2104,7 @@
         pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
 
   j11_cqlsh_dtests_py3_vnode:
@ -206,7 +206,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2090,7 +2113,7 @@
+@@ -2096,7 +2119,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j11_cqlsh_dtests_py3_offheap:
@ -215,7 +215,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2105,7 +2128,7 @@
+@@ -2111,7 +2134,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j11_cqlsh_dtests_py38_vnode:
@ -224,7 +224,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2123,7 +2146,7 @@
+@@ -2129,7 +2152,7 @@
           python_version: '3.8'
 
   j11_cqlsh_dtests_py311_vnode:
@ -233,7 +233,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2141,7 +2164,7 @@
+@@ -2147,7 +2170,7 @@
           python_version: '3.11'
 
   j11_cqlsh_dtests_py38_offheap:
@ -242,7 +242,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2159,7 +2182,7 @@
+@@ -2165,7 +2188,7 @@
           python_version: '3.8'
 
   j11_cqlsh_dtests_py311_offheap:
@ -251,7 +251,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2177,7 +2200,7 @@
+@@ -2183,7 +2206,7 @@
           python_version: '3.11'
 
   j11_cqlsh_dtests_py3:
@ -260,7 +260,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2192,7 +2215,7 @@
+@@ -2198,7 +2221,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j11_cqlsh_dtests_py38:
@ -269,7 +269,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2210,7 +2233,7 @@
+@@ -2216,7 +2239,7 @@
           python_version: '3.8'
 
   j11_cqlsh_dtests_py311:
@ -278,7 +278,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2228,7 +2251,7 @@
+@@ -2234,7 +2257,7 @@
           python_version: '3.11'
 
   j17_cqlsh_dtests_py3_vnode:
@ -287,7 +287,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2243,7 +2266,7 @@
+@@ -2249,7 +2272,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j17_cqlsh_dtests_py3_offheap:
@ -296,7 +296,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2258,7 +2281,7 @@
+@@ -2264,7 +2287,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j17_cqlsh_dtests_py38_vnode:
@ -305,7 +305,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2276,7 +2299,7 @@
+@@ -2282,7 +2305,7 @@
           python_version: '3.8'
 
   j17_cqlsh_dtests_py311_vnode:
@ -314,7 +314,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2294,7 +2317,7 @@
+@@ -2300,7 +2323,7 @@
           python_version: '3.11'
 
   j17_cqlsh_dtests_py38_offheap:
@ -323,7 +323,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2312,7 +2335,7 @@
+@@ -2318,7 +2341,7 @@
           python_version: '3.8'
 
   j17_cqlsh_dtests_py311_offheap:
@ -332,7 +332,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2330,7 +2353,7 @@
+@@ -2336,7 +2359,7 @@
           python_version: '3.11'
 
   j17_cqlsh_dtests_py3:
@ -341,7 +341,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2345,7 +2368,7 @@
+@@ -2351,7 +2374,7 @@
           extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
 
   j17_cqlsh_dtests_py38:
@ -350,7 +350,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2363,7 +2386,7 @@
+@@ -2369,7 +2392,7 @@
           python_version: '3.8'
 
   j17_cqlsh_dtests_py311:
@ -359,7 +359,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2381,7 +2404,7 @@
+@@ -2387,7 +2410,7 @@
           python_version: '3.11'
 
   j11_dtests_large_vnode:
@ -368,7 +368,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2395,7 +2418,7 @@
+@@ -2401,7 +2424,7 @@
           pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
 
   j11_dtests_large:
@ -377,7 +377,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2409,7 +2432,7 @@
+@@ -2415,7 +2438,7 @@
           pytest_extra_args: '--only-resource-intensive-tests --force-resource-intensive-tests'
 
   j17_dtests_large_vnode:
@ -386,7 +386,7 @@
     steps:
       - attach_workspace:
           at: /home/cassandra
-@@ -2423,7 +2446,7 @@
+@@ -2429,7 +2452,7 @@
           pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
 
   j17_dtests_large: