mirror of https://github.com/apache/cassandra
468 lines
12 KiB
Diff
468 lines
12 KiB
Diff
--- config_template.yml 2023-08-11 09:57:36.000000000 -0400
|
|
+++ config_template.yml.PAID 2023-08-11 09:58:40.000000000 -0400
|
|
@@ -145,20 +145,20 @@
|
|
j8_par_executor: &j8_par_executor
|
|
executor:
|
|
name: java8-executor
|
|
- #exec_resource_class: xlarge
|
|
- parallelism: 4
|
|
+ exec_resource_class: medium
|
|
+ parallelism: 25
|
|
|
|
j8_small_par_executor: &j8_small_par_executor
|
|
executor:
|
|
name: java8-executor
|
|
- #exec_resource_class: xlarge
|
|
- parallelism: 1
|
|
+ exec_resource_class: medium
|
|
+ parallelism: 10
|
|
|
|
j8_small_parallel_executor: &j8_small_parallel_executor
|
|
executor:
|
|
name: java8-executor
|
|
- #exec_resource_class: xlarge
|
|
- parallelism: 1
|
|
+ exec_resource_class: medium
|
|
+ parallelism: 4
|
|
|
|
j8_small_executor: &j8_small_executor
|
|
executor:
|
|
@@ -169,26 +169,44 @@
|
|
j8_medium_par_executor: &j8_medium_par_executor
|
|
executor:
|
|
name: java8-executor
|
|
- #exec_resource_class: xlarge
|
|
- parallelism: 1
|
|
+ exec_resource_class: xlarge
|
|
+ parallelism: 4
|
|
+
|
|
+j8_large_par_executor: &j8_large_par_executor
|
|
+ executor:
|
|
+ name: java8-executor
|
|
+ exec_resource_class: large
|
|
+ parallelism: 50
|
|
+
|
|
+j8_very_large_par_executor: &j8_very_large_par_executor
|
|
+ executor:
|
|
+ name: java8-executor
|
|
+ exec_resource_class: xlarge
|
|
+ parallelism: 100
|
|
|
|
j8_seq_executor: &j8_seq_executor
|
|
executor:
|
|
name: java8-executor
|
|
- #exec_resource_class: xlarge
|
|
+ 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: medium
|
|
+ parallelism: 10
|
|
+
|
|
+j11_small_parallel_executor: &j11_small_parallel_executor
|
|
+ executor:
|
|
+ name: java11-executor
|
|
+ #exec_resource_class: large
|
|
+ parallelism: 4
|
|
|
|
j11_small_executor: &j11_small_executor
|
|
executor:
|
|
@@ -199,44 +217,56 @@
|
|
j11_medium_par_executor: &j11_medium_par_executor
|
|
executor:
|
|
name: java11-executor
|
|
- #exec_resource_class: xlarge
|
|
- parallelism: 1
|
|
+ exec_resource_class: xlarge
|
|
+ parallelism: 4
|
|
+
|
|
+j11_large_par_executor: &j11_large_par_executor
|
|
+ executor:
|
|
+ name: java11-executor
|
|
+ exec_resource_class: large
|
|
+ parallelism: 50
|
|
|
|
j11_seq_executor: &j11_seq_executor
|
|
executor:
|
|
name: java11-executor
|
|
- #exec_resource_class: xlarge
|
|
+ exec_resource_class: medium
|
|
parallelism: 1 # sequential, single container tests: no parallelism benefits
|
|
|
|
j8_repeated_utest_executor: &j8_repeated_utest_executor
|
|
executor:
|
|
name: java8-executor
|
|
- parallelism: 4
|
|
+ exec_resource_class: medium
|
|
+ parallelism: 25
|
|
|
|
j8_repeated_dtest_executor: &j8_repeated_dtest_executor
|
|
executor:
|
|
name: java8-executor
|
|
- parallelism: 4
|
|
+ exec_resource_class: large
|
|
+ parallelism: 25
|
|
|
|
j8_repeated_upgrade_dtest_executor: &j8_repeated_upgrade_dtest_executor
|
|
executor:
|
|
name: java8-executor
|
|
- parallelism: 4
|
|
+ exec_resource_class: xlarge
|
|
+ parallelism: 25
|
|
|
|
j8_repeated_jvm_upgrade_dtest_executor: &j8_repeated_jvm_upgrade_dtest_executor
|
|
executor:
|
|
name: java8-executor
|
|
- parallelism: 4
|
|
+ exec_resource_class: medium
|
|
+ parallelism: 25
|
|
|
|
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_separate_jobs: &j8_separate_jobs
|
|
jobs:
|
|
@@ -1706,7 +1736,7 @@
|
|
target: testclasslist-system-keyspace-directory
|
|
|
|
j8_dtests_vnode:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1720,7 +1750,7 @@
|
|
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
|
|
|
|
j8_dtests_offheap:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1734,7 +1764,7 @@
|
|
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
|
|
|
|
j11_dtests_vnode:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1749,7 +1779,7 @@
|
|
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
|
|
|
|
j11_dtests_offheap:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1764,7 +1794,7 @@
|
|
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
|
|
|
|
j8_dtests:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1778,7 +1808,7 @@
|
|
pytest_extra_args: '--skip-resource-intensive-tests'
|
|
|
|
j11_dtests:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1793,7 +1823,7 @@
|
|
pytest_extra_args: '--skip-resource-intensive-tests'
|
|
|
|
j8_dtests_large_vnode:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_medium_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1807,7 +1837,7 @@
|
|
pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
|
|
|
|
j8_dtests_large:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_medium_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1821,7 +1851,7 @@
|
|
pytest_extra_args: '--num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
|
|
|
|
j11_dtests_large_vnode:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_medium_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1835,7 +1865,7 @@
|
|
pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
|
|
|
|
j11_dtests_large:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_medium_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1849,7 +1879,7 @@
|
|
pytest_extra_args: '--num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
|
|
|
|
j8_upgrade_dtests:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_very_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1863,7 +1893,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
|
|
@@ -1878,7 +1908,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
|
|
|
|
j8_cqlsh-dtests-py2-offheap:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1893,7 +1923,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
|
|
|
|
j8_cqlsh_dtests_py3_vnode:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1908,7 +1938,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
|
|
|
|
j8_cqlsh_dtests_py3_offheap:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1923,7 +1953,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
|
|
|
|
j8_cqlsh_dtests_py38_vnode:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1941,7 +1971,7 @@
|
|
python_version: '3.8'
|
|
|
|
j8_cqlsh_dtests_py311_vnode:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1959,7 +1989,7 @@
|
|
python_version: '3.11'
|
|
|
|
j8_cqlsh_dtests_py38_offheap:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1977,7 +2007,7 @@
|
|
python_version: '3.8'
|
|
|
|
j8_cqlsh_dtests_py311_offheap:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -1995,7 +2025,7 @@
|
|
python_version: '3.11'
|
|
|
|
j8_cqlsh-dtests-py2-no-vnodes:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2010,7 +2040,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
|
|
|
|
j8_cqlsh_dtests_py3:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2025,7 +2055,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
|
|
|
|
j8_cqlsh_dtests_py38:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2043,7 +2073,7 @@
|
|
python_version: '3.8'
|
|
|
|
j8_cqlsh_dtests_py311:
|
|
- <<: *j8_par_executor
|
|
+ <<: *j8_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2061,7 +2091,7 @@
|
|
python_version: '3.11'
|
|
|
|
j11_cqlsh-dtests-py2-with-vnodes:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2076,7 +2106,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
|
|
|
|
j11_cqlsh-dtests-py2-offheap:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2091,7 +2121,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
|
|
|
|
j11_cqlsh_dtests_py3_vnode:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2106,7 +2136,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
|
|
|
|
j11_cqlsh_dtests_py3_offheap:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2121,7 +2151,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
|
|
|
|
j11_cqlsh_dtests_py38_vnode:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2139,7 +2169,7 @@
|
|
python_version: '3.8'
|
|
|
|
j11_cqlsh_dtests_py311_vnode:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2157,7 +2187,7 @@
|
|
python_version: '3.11'
|
|
|
|
j11_cqlsh_dtests_py38_offheap:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2175,7 +2205,7 @@
|
|
python_version: '3.8'
|
|
|
|
j11_cqlsh_dtests_py311_offheap:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2193,7 +2223,7 @@
|
|
python_version: '3.11'
|
|
|
|
j11_cqlsh-dtests-py2-no-vnodes:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2208,7 +2238,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
|
|
|
|
j11_cqlsh_dtests_py3:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2223,7 +2253,7 @@
|
|
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
|
|
|
|
j11_cqlsh_dtests_py38:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -2241,7 +2271,7 @@
|
|
python_version: '3.8'
|
|
|
|
j11_cqlsh_dtests_py311:
|
|
- <<: *j11_par_executor
|
|
+ <<: *j11_large_par_executor
|
|
steps:
|
|
- attach_workspace:
|
|
at: /home/cassandra
|
|
@@ -3342,3 +3372,4 @@
|
|
- store_artifacts:
|
|
path: ~/cassandra-dtest/logs
|
|
destination: dtest_logs
|
|
+
|