diff --git a/.circleci/config.yml.PAID b/.circleci/config.yml.PAID index b61272cd9c..9802037eb7 100644 --- a/.circleci/config.yml.PAID +++ b/.circleci/config.yml.PAID @@ -21,7 +21,7 @@ jobs: j8_jvm_upgrade_dtests: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest - resource_class: xlarge + resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 4 @@ -1047,7 +1047,7 @@ jobs: j8_jvm_dtests_vnode: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest - resource_class: large + resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 10 @@ -3510,7 +3510,7 @@ jobs: j11_jvm_dtests_vnode: docker: - image: apache/cassandra-testing-ubuntu2004-java11:latest - resource_class: large + resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 10 @@ -6274,7 +6274,7 @@ jobs: j8_jvm_upgrade_dtests_repeat: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest - resource_class: large + resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 25 @@ -6975,7 +6975,7 @@ jobs: j11_jvm_dtests: docker: - image: apache/cassandra-testing-ubuntu2004-java11:latest - resource_class: large + resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 10 @@ -8364,7 +8364,7 @@ jobs: j8_jvm_dtests: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest - resource_class: large + resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 10 diff --git a/.circleci/config_template.yml b/.circleci/config_template.yml index 8531b542fc..c8343c1b90 100644 --- a/.circleci/config_template.yml +++ b/.circleci/config_template.yml @@ -166,6 +166,12 @@ j8_small_par_executor: &j8_small_par_executor #exec_resource_class: xlarge parallelism: 1 +j8_small_parallel_executor: &j8_small_parallel_executor + executor: + name: java8-executor + #exec_resource_class: xlarge + parallelism: 1 + j8_small_executor: &j8_small_executor executor: name: java8-executor @@ -1661,7 +1667,7 @@ jobs: arguments: "-Dtest.jvm.args='-Dcassandra.dtest.num_tokens=16'" j8_jvm_upgrade_dtests: - <<: *j8_medium_par_executor + <<: *j8_small_parallel_executor steps: - attach_workspace: at: /home/cassandra diff --git a/.circleci/config_template.yml.PAID.patch b/.circleci/config_template.yml.PAID.patch index 098ccd25a8..f841d262f3 100644 --- a/.circleci/config_template.yml.PAID.patch +++ b/.circleci/config_template.yml.PAID.patch @@ -1,6 +1,6 @@ ---- config-2_1.yml 2023-02-02 21:24:39.000000000 -0500 -+++ config-2_1.yml.MIDRES 2023-02-02 21:25:05.000000000 -0500 -@@ -157,14 +157,14 @@ +--- config_template.yml 2023-08-11 10:03:34.000000000 -0400 ++++ config_template.yml.PAID 2023-08-11 10:04:30.000000000 -0400 +@@ -157,20 +157,20 @@ j8_par_executor: &j8_par_executor executor: name: java8-executor @@ -14,12 +14,19 @@ name: java8-executor - #exec_resource_class: xlarge - parallelism: 1 -+ exec_resource_class: large ++ exec_resource_class: medium + parallelism: 10 + j8_small_parallel_executor: &j8_small_parallel_executor + executor: + name: java8-executor + #exec_resource_class: xlarge +- parallelism: 1 ++ parallelism: 4 + j8_small_executor: &j8_small_executor executor: -@@ -172,29 +172,41 @@ +@@ -178,29 +178,41 @@ exec_resource_class: medium parallelism: 1 @@ -63,12 +70,12 @@ name: java11-executor - #exec_resource_class: xlarge - parallelism: 1 -+ exec_resource_class: large ++ exec_resource_class: medium + parallelism: 10 j11_small_executor: &j11_small_executor executor: -@@ -205,44 +217,56 @@ +@@ -211,44 +223,56 @@ j11_medium_par_executor: &j11_medium_par_executor executor: name: java11-executor @@ -115,7 +122,7 @@ executor: name: java8-executor - parallelism: 4 -+ exec_resource_class: large ++ exec_resource_class: medium + parallelism: 25 j11_repeated_utest_executor: &j11_repeated_utest_executor @@ -134,7 +141,7 @@ j8_separate_jobs: &j8_separate_jobs jobs: -@@ -1819,7 +1843,7 @@ +@@ -1825,7 +1849,7 @@ target: testclasslist-system-keyspace-directory j8_dtests_vnode: @@ -143,7 +150,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1833,7 +1857,7 @@ +@@ -1839,7 +1863,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests' j8_dtests_offheap: @@ -152,7 +159,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1847,7 +1871,7 @@ +@@ -1853,7 +1877,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests' j11_dtests_vnode: @@ -161,7 +168,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1862,7 +1886,7 @@ +@@ -1868,7 +1892,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests' j11_dtests_offheap: @@ -170,7 +177,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1877,7 +1901,7 @@ +@@ -1883,7 +1907,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests' j8_dtests: @@ -179,7 +186,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1891,7 +1915,7 @@ +@@ -1897,7 +1921,7 @@ pytest_extra_args: '--skip-resource-intensive-tests' j11_dtests: @@ -188,7 +195,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1906,7 +1930,7 @@ +@@ -1912,7 +1936,7 @@ pytest_extra_args: '--skip-resource-intensive-tests' j8_upgrade_dtests: @@ -197,7 +204,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1920,7 +1944,7 @@ +@@ -1926,7 +1950,7 @@ pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all' j8_cqlsh_dtests_py3_vnode: @@ -206,7 +213,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1935,7 +1959,7 @@ +@@ -1941,7 +1965,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j8_cqlsh_dtests_py3_offheap: @@ -215,7 +222,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1950,7 +1974,7 @@ +@@ -1956,7 +1980,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j8_cqlsh_dtests_py38_vnode: @@ -224,7 +231,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1968,7 +1992,7 @@ +@@ -1974,7 +1998,7 @@ python_version: '3.8' j8_cqlsh_dtests_py311_vnode: @@ -233,7 +240,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1986,7 +2010,7 @@ +@@ -1992,7 +2016,7 @@ python_version: '3.11' j8_cqlsh_dtests_py38_offheap: @@ -242,7 +249,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2004,7 +2028,7 @@ +@@ -2010,7 +2034,7 @@ python_version: '3.8' j8_cqlsh_dtests_py311_offheap: @@ -251,7 +258,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2022,7 +2046,7 @@ +@@ -2028,7 +2052,7 @@ python_version: '3.11' j8_cqlsh_dtests_py3: @@ -260,7 +267,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2037,7 +2061,7 @@ +@@ -2043,7 +2067,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j8_cqlsh_dtests_py38: @@ -269,7 +276,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2055,7 +2079,7 @@ +@@ -2061,7 +2085,7 @@ python_version: '3.8' j8_cqlsh_dtests_py311: @@ -278,7 +285,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2073,7 +2097,7 @@ +@@ -2079,7 +2103,7 @@ python_version: '3.11' j11_cqlsh_dtests_py3_vnode: @@ -287,7 +294,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2088,7 +2112,7 @@ +@@ -2094,7 +2118,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j11_cqlsh_dtests_py3_offheap: @@ -296,7 +303,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2103,7 +2127,7 @@ +@@ -2109,7 +2133,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j11_cqlsh_dtests_py38_vnode: @@ -305,7 +312,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2121,7 +2145,7 @@ +@@ -2127,7 +2151,7 @@ python_version: '3.8' j11_cqlsh_dtests_py311_vnode: @@ -314,7 +321,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2139,7 +2163,7 @@ +@@ -2145,7 +2169,7 @@ python_version: '3.11' j11_cqlsh_dtests_py38_offheap: @@ -323,7 +330,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2157,7 +2181,7 @@ +@@ -2163,7 +2187,7 @@ python_version: '3.8' j11_cqlsh_dtests_py311_offheap: @@ -332,7 +339,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2175,7 +2199,7 @@ +@@ -2181,7 +2205,7 @@ python_version: '3.11' j11_cqlsh_dtests_py3: @@ -341,7 +348,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2190,7 +2214,7 @@ +@@ -2196,7 +2220,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j11_cqlsh_dtests_py38: @@ -350,7 +357,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2208,7 +2232,7 @@ +@@ -2214,7 +2238,7 @@ python_version: '3.8' j11_cqlsh_dtests_py311: @@ -359,7 +366,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2226,7 +2250,7 @@ +@@ -2232,7 +2256,7 @@ python_version: '3.11' j8_dtests_large_vnode: @@ -368,7 +375,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2240,7 +2264,7 @@ +@@ -2246,7 +2270,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests' j8_dtests_large: @@ -377,7 +384,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2254,7 +2278,7 @@ +@@ -2260,7 +2284,7 @@ pytest_extra_args: '--only-resource-intensive-tests --force-resource-intensive-tests' j11_dtests_large_vnode: @@ -386,7 +393,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2268,7 +2292,7 @@ +@@ -2274,7 +2298,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests' j11_dtests_large: