natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.1' into cassandra-5.0

This commit is contained in:
Ekaterina Dimitrova 2023-08-13 17:20:41 -04:00
parent 000533cb63 c778a76adb
commit 56b332b4cf
3 changed files with 58 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.circleci/config.yml.PAID
View File

@ -21,7 +21,7 @@ jobs:
j11_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
@ -3999,7 +3999,7 @@ jobs:
j17_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
@ -4938,7 +4938,7 @@ jobs:
j11_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
@ -5435,7 +5435,7 @@ jobs:
j11_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
@ -8145,7 +8145,7 @@ jobs:
j11_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
@ -8770,7 +8770,7 @@ jobs:
j17_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

8
.circleci/config_template.yml
View File

@ -166,6 +166,12 @@ j11_small_par_executor: &j11_small_par_executor
#exec_resource_class: xlarge
parallelism: 1
j11_small_parallel_executor: &j11_small_parallel_executor
executor:
name: java11-executor
#exec_resource_class: xlarge
parallelism: 1
j11_small_executor: &j11_small_executor
executor:
name: java11-executor
@ -1778,7 +1784,7 @@ jobs:
target: "testclasslist"
j11_jvm_upgrade_dtests:
<<: *j11_medium_par_executor
<<: *j11_small_parallel_executor
steps:
- attach_workspace:
at: /home/cassandra

82
.circleci/config_template.yml.PAID.patch
View File

@ -1,6 +1,6 @@
--- config_template.yml 2023-07-24 11:55:54.000000000 -0400
+++ config_template.yml.PAID 2023-07-24 11:58:41.000000000 -0400
@@ -157,14 +157,14 @@
--- config_template.yml 2023-08-11 10:06:39.000000000 -0400
+++ config_template.yml.PAID 2023-08-11 10:07:25.000000000 -0400
@@ -157,20 +157,20 @@
j11_par_executor: &j11_par_executor
executor:
name: java11-executor
@ -14,12 +14,20 @@
name: java11-executor
- #exec_resource_class: xlarge
- parallelism: 1
+ exec_resource_class: large
+ exec_resource_class: medium
+ parallelism: 10
j11_small_parallel_executor: &j11_small_parallel_executor
executor:
name: java11-executor
- #exec_resource_class: xlarge
- parallelism: 1
+ exec_resource_class: medium
+ parallelism: 4
j11_small_executor: &j11_small_executor
executor:
@@ -172,30 +172,41 @@
@@ -178,30 +178,41 @@
exec_resource_class: medium
parallelism: 1
@ -63,12 +71,12 @@
name: java17-executor
- #exec_resource_class: xlarge
- parallelism: 1
+ exec_resource_class: large
+ exec_resource_class: medium
+ parallelism: 10
j17_small_executor: &j17_small_executor
executor:
@@ -206,44 +217,56 @@
@@ -212,44 +223,56 @@
j17_medium_par_executor: &j17_medium_par_executor
executor:
name: java17-executor
@ -94,7 +102,7 @@
executor:
name: java11-executor
- parallelism: 4
+ exec_resource_class: large
+ exec_resource_class: medium
+ parallelism: 25
j11_repeated_utest_executor: &j11_repeated_utest_executor
@ -134,7 +142,7 @@
j11_separate_jobs: &j11_separate_jobs
jobs:
@@ -1980,7 +2003,7 @@
@@ -1986,7 +2009,7 @@
target: testclasslist-system-keyspace-directory
j11_dtests_vnode:
@ -143,7 +151,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1994,7 +2017,7 @@
@@ -2000,7 +2023,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j11_dtests_offheap:
@ -152,7 +160,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2008,7 +2031,7 @@
@@ -2014,7 +2037,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
j17_dtests_vnode:
@ -161,7 +169,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2023,7 +2046,7 @@
@@ -2029,7 +2052,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j17_dtests_offheap:
@ -170,7 +178,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2038,7 +2061,7 @@
@@ -2044,7 +2067,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
j11_dtests:
@ -179,7 +187,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2052,7 +2075,7 @@
@@ -2058,7 +2081,7 @@
pytest_extra_args: '--skip-resource-intensive-tests'
j17_dtests:
@ -188,7 +196,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2067,7 +2090,7 @@
@@ -2073,7 +2096,7 @@
pytest_extra_args: '--skip-resource-intensive-tests'
j11_upgrade_dtests:
@ -197,7 +205,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2081,7 +2104,7 @@
@@ -2087,7 +2110,7 @@
pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
j11_cqlsh_dtests_py3_vnode:
@ -206,7 +214,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2096,7 +2119,7 @@
@@ -2102,7 +2125,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py3_offheap:
@ -215,7 +223,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2111,7 +2134,7 @@
@@ -2117,7 +2140,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py38_vnode:
@ -224,7 +232,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2129,7 +2152,7 @@
@@ -2135,7 +2158,7 @@
python_version: '3.8'
j11_cqlsh_dtests_py311_vnode:
@ -233,7 +241,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2147,7 +2170,7 @@
@@ -2153,7 +2176,7 @@
python_version: '3.11'
j11_cqlsh_dtests_py38_offheap:
@ -242,7 +250,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2165,7 +2188,7 @@
@@ -2171,7 +2194,7 @@
python_version: '3.8'
j11_cqlsh_dtests_py311_offheap:
@ -251,7 +259,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2183,7 +2206,7 @@
@@ -2189,7 +2212,7 @@
python_version: '3.11'
j11_cqlsh_dtests_py3:
@ -260,7 +268,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2198,7 +2221,7 @@
@@ -2204,7 +2227,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py38:
@ -269,7 +277,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2216,7 +2239,7 @@
@@ -2222,7 +2245,7 @@
python_version: '3.8'
j11_cqlsh_dtests_py311:
@ -278,7 +286,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2234,7 +2257,7 @@
@@ -2240,7 +2263,7 @@
python_version: '3.11'
j17_cqlsh_dtests_py3_vnode:
@ -287,7 +295,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2249,7 +2272,7 @@
@@ -2255,7 +2278,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j17_cqlsh_dtests_py3_offheap:
@ -296,7 +304,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2264,7 +2287,7 @@
@@ -2270,7 +2293,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j17_cqlsh_dtests_py38_vnode:
@ -305,7 +313,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2282,7 +2305,7 @@
@@ -2288,7 +2311,7 @@
python_version: '3.8'
j17_cqlsh_dtests_py311_vnode:
@ -314,7 +322,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2300,7 +2323,7 @@
@@ -2306,7 +2329,7 @@
python_version: '3.11'
j17_cqlsh_dtests_py38_offheap:
@ -323,7 +331,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2318,7 +2341,7 @@
@@ -2324,7 +2347,7 @@
python_version: '3.8'
j17_cqlsh_dtests_py311_offheap:
@ -332,7 +340,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2336,7 +2359,7 @@
@@ -2342,7 +2365,7 @@
python_version: '3.11'
j17_cqlsh_dtests_py3:
@ -341,7 +349,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2351,7 +2374,7 @@
@@ -2357,7 +2380,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j17_cqlsh_dtests_py38:
@ -350,7 +358,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2369,7 +2392,7 @@
@@ -2375,7 +2398,7 @@
python_version: '3.8'
j17_cqlsh_dtests_py311:
@ -359,7 +367,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2387,7 +2410,7 @@
@@ -2393,7 +2416,7 @@
python_version: '3.11'
j11_dtests_large_vnode:
@ -368,7 +376,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2401,7 +2424,7 @@
@@ -2407,7 +2430,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
j11_dtests_large:
@ -377,7 +385,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2415,7 +2438,7 @@
@@ -2421,7 +2444,7 @@
pytest_extra_args: '--only-resource-intensive-tests --force-resource-intensive-tests'
j17_dtests_large_vnode:
@ -386,7 +394,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2429,7 +2452,7 @@
@@ -2435,7 +2458,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
j17_dtests_large: