This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ff6ad4e48a04e5f78215da287fcf037ecb556016 Merge: a8465376f7 f345ee8a4e Author: Ekaterina Dimitrova <[email protected]> AuthorDate: Sat Feb 11 15:31:43 2023 -0500 Merge branch 'cassandra-4.1' into trunk .circleci/config-2_1.yml | 44 +-- .circleci/config-2_1.yml.high_res.patch | 12 +- .circleci/config-2_1.yml.mid_res.patch | 66 ++-- .circleci/config.yml | 12 +- .circleci/config.yml.HIGHRES | 12 +- .circleci/config.yml.LOWRES | 12 +- .circleci/config.yml.MIDRES | 525 +------------------------------- .circleci/generate.sh | 2 +- .circleci/readme.md | 10 +- 9 files changed, 77 insertions(+), 618 deletions(-) diff --cc .circleci/config-2_1.yml.high_res.patch index 7d9c3e639e,46c8c15ce9..85f69c7578 --- a/.circleci/config-2_1.yml.high_res.patch +++ b/.circleci/config-2_1.yml.high_res.patch @@@ -1,6 -1,6 +1,6 @@@ - --- config-2_1.yml 2022-12-08 12:05:10.056741273 -0600 - +++ config-2_1.yml.HIGHRES 2022-12-08 12:14:31.612411783 -0600 ---- config-2_1.yml 2023-02-02 21:24:39.000000000 -0500 -+++ config-2_1.yml.HIGHRES 2023-02-02 21:24:57.000000000 -0500 -@@ -157,14 +157,14 @@ ++--- config-2_1.yml 2023-02-02 21:26:13.000000000 -0500 +++++ config-2_1.yml.HIGHRES 2023-02-02 21:27:02.000000000 -0500 +@@ -158,14 +158,14 @@ j8_par_executor: &j8_par_executor executor: name: java8-executor @@@ -111,7 -117,7 +111,7 @@@ j8_separate_jobs: &j8_separate_jobs jobs: - @@ -2329,7 +2335,7 @@ -@@ -2226,7 +2232,7 @@ ++@@ -2338,7 +2344,7 @@ python_version: '3.11' j8_dtests_large_vnode: @@@ -120,7 -126,7 +120,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2343,7 +2349,7 @@ -@@ -2240,7 +2246,7 @@ ++@@ -2352,7 +2358,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests' j8_dtests_large: @@@ -129,7 -135,7 +129,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2357,7 +2363,7 @@ -@@ -2254,7 +2260,7 @@ ++@@ -2366,7 +2372,7 @@ pytest_extra_args: '--only-resource-intensive-tests --force-resource-intensive-tests' j11_dtests_large_vnode: @@@ -138,7 -144,7 +138,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2371,7 +2377,7 @@ -@@ -2268,7 +2274,7 @@ ++@@ -2380,7 +2386,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests' j11_dtests_large: diff --cc .circleci/config-2_1.yml.mid_res.patch index c326d566ae,098ccd25a8..f5c890c15e --- a/.circleci/config-2_1.yml.mid_res.patch +++ b/.circleci/config-2_1.yml.mid_res.patch @@@ -1,6 -1,6 +1,6 @@@ - --- config-2_1.yml 2023-01-19 11:05:52.546896275 -0600 - +++ config-2_1.yml.MIDRES 2023-01-19 11:08:59.816172429 -0600 ---- 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-2_1.yml 2023-02-02 21:26:13.000000000 -0500 +++++ config-2_1.yml.MIDRES 2023-02-02 21:27:09.000000000 -0500 +@@ -158,14 +158,14 @@ j8_par_executor: &j8_par_executor executor: name: java8-executor @@@ -134,7 -134,7 +134,7 @@@ j8_separate_jobs: &j8_separate_jobs jobs: - @@ -1949,7 +1973,7 @@ -@@ -1819,7 +1843,7 @@ ++@@ -1931,7 +1955,7 @@ target: testclasslist-system-keyspace-directory j8_dtests_vnode: @@@ -143,7 -143,7 +143,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -1963,7 +1987,7 @@ -@@ -1833,7 +1857,7 @@ ++@@ -1945,7 +1969,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests' j8_dtests_offheap: @@@ -152,7 -152,7 +152,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -1977,7 +2001,7 @@ -@@ -1847,7 +1871,7 @@ ++@@ -1959,7 +1983,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests' j11_dtests_vnode: @@@ -161,7 -161,7 +161,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -1992,7 +2016,7 @@ -@@ -1862,7 +1886,7 @@ ++@@ -1974,7 +1998,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests' j11_dtests_offheap: @@@ -170,7 -170,7 +170,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2007,7 +2031,7 @@ -@@ -1877,7 +1901,7 @@ ++@@ -1989,7 +2013,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests' j8_dtests: @@@ -179,7 -179,7 +179,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2021,7 +2045,7 @@ -@@ -1891,7 +1915,7 @@ ++@@ -2003,7 +2027,7 @@ pytest_extra_args: '--skip-resource-intensive-tests' j11_dtests: @@@ -188,7 -188,7 +188,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2036,7 +2060,7 @@ -@@ -1906,7 +1930,7 @@ ++@@ -2018,7 +2042,7 @@ pytest_extra_args: '--skip-resource-intensive-tests' j8_upgrade_dtests: @@@ -197,7 -197,7 +197,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2050,7 +2074,7 @@ -@@ -1920,7 +1944,7 @@ ++@@ -2032,7 +2056,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 +206,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2065,7 +2089,7 @@ -@@ -1935,7 +1959,7 @@ ++@@ -2047,7 +2071,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j8_cqlsh_dtests_py3_offheap: @@@ -215,7 -215,7 +215,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2080,7 +2104,7 @@ -@@ -1950,7 +1974,7 @@ ++@@ -2062,7 +2086,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j8_cqlsh_dtests_py38_vnode: @@@ -224,7 -224,7 +224,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2098,7 +2122,7 @@ -@@ -1968,7 +1992,7 @@ ++@@ -2080,7 +2104,7 @@ python_version: '3.8' j8_cqlsh_dtests_py311_vnode: @@@ -233,7 -233,7 +233,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2116,7 +2140,7 @@ -@@ -1986,7 +2010,7 @@ ++@@ -2098,7 +2122,7 @@ python_version: '3.11' j8_cqlsh_dtests_py38_offheap: @@@ -242,7 -242,7 +242,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2134,7 +2158,7 @@ -@@ -2004,7 +2028,7 @@ ++@@ -2116,7 +2140,7 @@ python_version: '3.8' j8_cqlsh_dtests_py311_offheap: @@@ -251,7 -251,7 +251,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2152,7 +2176,7 @@ -@@ -2022,7 +2046,7 @@ ++@@ -2134,7 +2158,7 @@ python_version: '3.11' j8_cqlsh_dtests_py3: @@@ -260,7 -260,7 +260,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2167,7 +2191,7 @@ -@@ -2037,7 +2061,7 @@ ++@@ -2149,7 +2173,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j8_cqlsh_dtests_py38: @@@ -269,7 -269,7 +269,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2185,7 +2209,7 @@ -@@ -2055,7 +2079,7 @@ ++@@ -2167,7 +2191,7 @@ python_version: '3.8' j8_cqlsh_dtests_py311: @@@ -278,7 -278,7 +278,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2203,7 +2227,7 @@ -@@ -2073,7 +2097,7 @@ ++@@ -2185,7 +2209,7 @@ python_version: '3.11' j11_cqlsh_dtests_py3_vnode: @@@ -287,7 -287,7 +287,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2218,7 +2242,7 @@ -@@ -2088,7 +2112,7 @@ ++@@ -2200,7 +2224,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j11_cqlsh_dtests_py3_offheap: @@@ -296,7 -296,7 +296,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2233,7 +2257,7 @@ -@@ -2103,7 +2127,7 @@ ++@@ -2215,7 +2239,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j11_cqlsh_dtests_py38_vnode: @@@ -305,7 -305,7 +305,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2251,7 +2275,7 @@ -@@ -2121,7 +2145,7 @@ ++@@ -2233,7 +2257,7 @@ python_version: '3.8' j11_cqlsh_dtests_py311_vnode: @@@ -314,7 -314,7 +314,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2269,7 +2293,7 @@ -@@ -2139,7 +2163,7 @@ ++@@ -2251,7 +2275,7 @@ python_version: '3.11' j11_cqlsh_dtests_py38_offheap: @@@ -323,7 -323,7 +323,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2287,7 +2311,7 @@ -@@ -2157,7 +2181,7 @@ ++@@ -2269,7 +2293,7 @@ python_version: '3.8' j11_cqlsh_dtests_py311_offheap: @@@ -332,7 -332,7 +332,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2305,7 +2329,7 @@ -@@ -2175,7 +2199,7 @@ ++@@ -2287,7 +2311,7 @@ python_version: '3.11' j11_cqlsh_dtests_py3: @@@ -341,7 -341,7 +341,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2320,7 +2344,7 @@ -@@ -2190,7 +2214,7 @@ ++@@ -2302,7 +2326,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j11_cqlsh_dtests_py38: @@@ -350,7 -350,7 +350,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2338,7 +2362,7 @@ -@@ -2208,7 +2232,7 @@ ++@@ -2320,7 +2344,7 @@ python_version: '3.8' j11_cqlsh_dtests_py311: @@@ -359,7 -359,7 +359,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2356,7 +2380,7 @@ -@@ -2226,7 +2250,7 @@ ++@@ -2338,7 +2362,7 @@ python_version: '3.11' j8_dtests_large_vnode: @@@ -368,7 -368,7 +368,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2370,7 +2394,7 @@ -@@ -2240,7 +2264,7 @@ ++@@ -2352,7 +2376,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests' j8_dtests_large: @@@ -377,7 -377,7 +377,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2384,7 +2408,7 @@ -@@ -2254,7 +2278,7 @@ ++@@ -2366,7 +2390,7 @@ pytest_extra_args: '--only-resource-intensive-tests --force-resource-intensive-tests' j11_dtests_large_vnode: @@@ -386,7 -386,7 +386,7 @@@ steps: - attach_workspace: at: /home/cassandra - @@ -2398,7 +2422,7 @@ -@@ -2268,7 +2292,7 @@ ++@@ -2380,7 +2404,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests' j11_dtests_large: diff --cc .circleci/config.yml.MIDRES index 8f1d9df795,3118f379e2..b2790f5e89 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@@ -10267,42 -9569,6 +10201,18 @@@ workflows requires: - start_j11_utests_compression - j8_build - - start_j8_utests_compression_repeat: - type: approval - - j8_utests_compression_repeat: - requires: - - start_j8_utests_compression_repeat - - j8_build - - start_j11_utests_compression_repeat: - type: approval - - j11_utests_compression_repeat: - requires: - - start_j11_utests_compression_repeat - - j8_build + - start_j8_utests_trie: + type: approval + - j8_utests_trie: + requires: + - start_j8_utests_trie + - j8_build + - start_j11_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_j11_utests_trie + - j8_build - - start_j8_utests_trie_repeat: - type: approval - - j8_utests_trie_repeat: - requires: - - start_j8_utests_trie_repeat - - j8_build - - start_j11_utests_trie_repeat: - type: approval - - j11_utests_trie_repeat: - requires: - - start_j11_utests_trie_repeat - - j8_build - start_j8_utests_stress: type: approval - j8_utests_stress: @@@ -10724,32 -9833,6 +10477,16 @@@ requires: - start_utests_compression - j8_build - - j8_utests_compression_repeat: - requires: - - start_utests_compression - - j8_build - - j11_utests_compression_repeat: - requires: - - start_utests_compression - - j8_build + - start_utests_trie: + type: approval + - j8_utests_trie: + requires: + - start_utests_trie + - j8_build + - j11_utests_trie: + requires: + - start_utests_trie + - j8_build - - j8_utests_trie_repeat: - requires: - - start_utests_trie - - j8_build - - j11_utests_trie_repeat: - requires: - - start_utests_trie - - j8_build - start_utests_stress: type: approval - j8_utests_stress: @@@ -11011,30 -10010,6 +10664,12 @@@ requires: - start_j11_jvm_dtests_vnode - j11_build - - start_j11_jvm_dtests_repeat: - type: approval - - j11_jvm_dtests_repeat: - requires: - - start_j11_jvm_dtests_repeat - - j11_build - - start_j11_jvm_dtests_vnode_repeat: - type: approval - - j11_jvm_dtests_vnode_repeat: - requires: - - start_j11_jvm_dtests_vnode_repeat - - j11_build + - start_j11_simulator_dtests: + type: approval + - j11_simulator_dtests: + requires: + - start_j11_simulator_dtests + - j11_build - - start_j11_simulator_dtests_repeat: - type: approval - - j11_simulator_dtests_repeat: - requires: - - start_j11_simulator_dtests_repeat - - j11_build - start_j11_cqlshlib_tests: type: approval - j11_cqlshlib_tests: @@@ -11165,24 -10110,6 +10770,12 @@@ requires: - start_j11_utests_compression - j11_build - - start_j11_utests_compression_repeat: - type: approval - - j11_utests_compression_repeat: - requires: - - start_j11_utests_compression_repeat - - j11_build + - start_j11_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_j11_utests_trie + - j11_build - - start_j11_utests_trie_repeat: - type: approval - - j11_utests_trie_repeat: - requires: - - start_j11_utests_trie_repeat - - j11_build - start_j11_utests_stress: type: approval - j11_utests_stress: @@@ -11256,18 -10144,6 +10810,9 @@@ - j11_jvm_dtests_vnode: requires: - j11_build - - j11_jvm_dtests_vnode_repeat: - requires: - - j11_build + - j11_simulator_dtests: + requires: + - j11_build - - j11_simulator_dtests_repeat: - requires: - - j11_build - j11_cqlshlib_tests: requires: - j11_build @@@ -11380,20 -10222,6 +10891,12 @@@ requires: - start_utests_compression - j11_build - - j11_utests_compression_repeat: - requires: - - start_utests_compression - - j11_build + - start_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_utests_trie + - j11_build - - j11_utests_trie_repeat: - requires: - - start_utests_trie - - j11_build - start_utests_stress: type: approval - j11_utests_stress: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
