mirror of https://github.com/apache/cassandra
Merge branch 'cassandra-4.0' into cassandra-4.1
This commit is contained in:
Andrés de la Peña
commit
1d1866b86d
|
|
@ -193,6 +193,12 @@ j11_small_executor: &j11_small_executor
|
|||
#exec_resource_class: medium
|
||||
parallelism: 1
|
||||
|
||||
j11_seq_executor: &j11_seq_executor
|
||||
executor:
|
||||
name: java11-executor
|
||||
#exec_resource_class: xlarge
|
||||
parallelism: 1 # sequential, single container tests: no parallelism benefits
|
||||
|
||||
j8_repeated_utest_executor: &j8_repeated_utest_executor
|
||||
executor:
|
||||
name: java8-executor
|
||||
|
|
@ -298,66 +304,150 @@ j8_separate_jobs: &j8_separate_jobs
|
|||
requires:
|
||||
- start_j11_unit_tests_repeat
|
||||
- j8_build
|
||||
# specialized unit tests (all run on request using Java 8)
|
||||
- start_utests_long:
|
||||
# specialized unit tests (all run on request)
|
||||
- start_j8_utests_long:
|
||||
type: approval
|
||||
- utests_long:
|
||||
- j8_utests_long:
|
||||
requires:
|
||||
- start_utests_long
|
||||
- start_j8_utests_long
|
||||
- j8_build
|
||||
- start_utests_long_repeat:
|
||||
- start_j11_utests_long:
|
||||
type: approval
|
||||
- utests_long_repeat:
|
||||
- j11_utests_long:
|
||||
requires:
|
||||
- start_utests_long_repeat
|
||||
- start_j11_utests_long
|
||||
- j8_build
|
||||
- start_utests_compression:
|
||||
- start_j8_utests_long_repeat:
|
||||
type: approval
|
||||
- utests_compression:
|
||||
- j8_utests_long_repeat:
|
||||
requires:
|
||||
- start_utests_compression
|
||||
- start_j8_utests_long_repeat
|
||||
- j8_build
|
||||
- start_utests_compression_repeat:
|
||||
- start_j11_utests_long_repeat:
|
||||
type: approval
|
||||
- utests_compression_repeat:
|
||||
- j11_utests_long_repeat:
|
||||
requires:
|
||||
- start_utests_compression_repeat
|
||||
- start_j11_utests_long_repeat
|
||||
- j8_build
|
||||
- start_utests_stress:
|
||||
- start_j8_utests_cdc:
|
||||
type: approval
|
||||
- utests_stress:
|
||||
- j8_utests_cdc:
|
||||
requires:
|
||||
- start_utests_stress
|
||||
- start_j8_utests_cdc
|
||||
- j8_build
|
||||
- start_utests_stress_repeat:
|
||||
- start_j11_utests_cdc:
|
||||
type: approval
|
||||
- utests_stress_repeat:
|
||||
- j11_utests_cdc:
|
||||
requires:
|
||||
- start_utests_stress_repeat
|
||||
- start_j11_utests_cdc
|
||||
- j8_build
|
||||
- start_utests_fqltool:
|
||||
- start_j8_utests_cdc_repeat:
|
||||
type: approval
|
||||
- utests_fqltool:
|
||||
- j8_utests_cdc_repeat:
|
||||
requires:
|
||||
- start_utests_fqltool
|
||||
- start_j8_utests_cdc_repeat
|
||||
- j8_build
|
||||
- start_utests_fqltool_repeat:
|
||||
- start_j11_utests_cdc_repeat:
|
||||
type: approval
|
||||
- utests_fqltool_repeat:
|
||||
- j11_utests_cdc_repeat:
|
||||
requires:
|
||||
- start_utests_fqltool_repeat
|
||||
- start_j11_utests_cdc_repeat
|
||||
- j8_build
|
||||
- start_utests_system_keyspace_directory:
|
||||
- start_j8_utests_compression:
|
||||
type: approval
|
||||
- utests_system_keyspace_directory:
|
||||
- j8_utests_compression:
|
||||
requires:
|
||||
- start_utests_system_keyspace_directory
|
||||
- start_j8_utests_compression
|
||||
- j8_build
|
||||
- start_utests_system_keyspace_directory_repeat:
|
||||
- start_j11_utests_compression:
|
||||
type: approval
|
||||
- utests_system_keyspace_directory_repeat:
|
||||
- j11_utests_compression:
|
||||
requires:
|
||||
- start_utests_system_keyspace_directory_repeat
|
||||
- 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_stress:
|
||||
type: approval
|
||||
- j8_utests_stress:
|
||||
requires:
|
||||
- start_j8_utests_stress
|
||||
- j8_build
|
||||
- start_j11_utests_stress:
|
||||
type: approval
|
||||
- j11_utests_stress:
|
||||
requires:
|
||||
- start_j11_utests_stress
|
||||
- j8_build
|
||||
- start_j8_utests_stress_repeat:
|
||||
type: approval
|
||||
- j8_utests_stress_repeat:
|
||||
requires:
|
||||
- start_j8_utests_stress_repeat
|
||||
- j8_build
|
||||
- start_j11_utests_stress_repeat:
|
||||
type: approval
|
||||
- j11_utests_stress_repeat:
|
||||
requires:
|
||||
- start_j11_utests_stress_repeat
|
||||
- j8_build
|
||||
- start_j8_utests_fqltool:
|
||||
type: approval
|
||||
- j8_utests_fqltool:
|
||||
requires:
|
||||
- start_j8_utests_fqltool
|
||||
- j8_build
|
||||
- start_j11_utests_fqltool:
|
||||
type: approval
|
||||
- j11_utests_fqltool:
|
||||
requires:
|
||||
- start_j11_utests_fqltool
|
||||
- j8_build
|
||||
- start_j8_utests_fqltool_repeat:
|
||||
type: approval
|
||||
- j8_utests_fqltool_repeat:
|
||||
requires:
|
||||
- start_j8_utests_fqltool_repeat
|
||||
- j8_build
|
||||
- start_j11_utests_fqltool_repeat:
|
||||
type: approval
|
||||
- j11_utests_fqltool_repeat:
|
||||
requires:
|
||||
- start_j11_utests_fqltool_repeat
|
||||
- j8_build
|
||||
- start_j8_utests_system_keyspace_directory:
|
||||
type: approval
|
||||
- j8_utests_system_keyspace_directory:
|
||||
requires:
|
||||
- start_j8_utests_system_keyspace_directory
|
||||
- j8_build
|
||||
- start_j11_utests_system_keyspace_directory:
|
||||
type: approval
|
||||
- j11_utests_system_keyspace_directory:
|
||||
requires:
|
||||
- start_j11_utests_system_keyspace_directory
|
||||
- j8_build
|
||||
- start_j8_utests_system_keyspace_directory_repeat:
|
||||
type: approval
|
||||
- j8_utests_system_keyspace_directory_repeat:
|
||||
requires:
|
||||
- start_j8_utests_system_keyspace_directory_repeat
|
||||
- j8_build
|
||||
- start_j11_utests_system_keyspace_directory_repeat:
|
||||
type: approval
|
||||
- j11_utests_system_keyspace_directory_repeat:
|
||||
requires:
|
||||
- start_j11_utests_system_keyspace_directory_repeat
|
||||
- j8_build
|
||||
- start_j8_dtest_jars_build:
|
||||
type: approval
|
||||
|
|
@ -538,52 +628,112 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
|
|||
- j11_unit_tests_repeat:
|
||||
requires:
|
||||
- j8_build
|
||||
# specialized unit tests (all run on request using Java 8)
|
||||
# specialized unit tests (all run on request)
|
||||
- start_utests_long:
|
||||
type: approval
|
||||
- utests_long:
|
||||
- j8_utests_long:
|
||||
requires:
|
||||
- start_utests_long
|
||||
- j8_build
|
||||
- utests_long_repeat:
|
||||
- j11_utests_long:
|
||||
requires:
|
||||
- start_utests_long
|
||||
- j8_build
|
||||
- j8_utests_long_repeat:
|
||||
requires:
|
||||
- start_utests_long
|
||||
- j8_build
|
||||
- j11_utests_long_repeat:
|
||||
requires:
|
||||
- start_utests_long
|
||||
- j8_build
|
||||
- start_utests_cdc:
|
||||
type: approval
|
||||
- j8_utests_cdc:
|
||||
requires:
|
||||
- start_utests_cdc
|
||||
- j8_build
|
||||
- j11_utests_cdc:
|
||||
requires:
|
||||
- start_utests_cdc
|
||||
- j8_build
|
||||
- j8_utests_cdc_repeat:
|
||||
requires:
|
||||
- start_utests_cdc
|
||||
- j8_build
|
||||
- j11_utests_cdc_repeat:
|
||||
requires:
|
||||
- start_utests_cdc
|
||||
- j8_build
|
||||
- start_utests_compression:
|
||||
type: approval
|
||||
- utests_compression:
|
||||
- j8_utests_compression:
|
||||
requires:
|
||||
- start_utests_compression
|
||||
- j8_build
|
||||
- utests_compression_repeat:
|
||||
- j11_utests_compression:
|
||||
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_stress:
|
||||
type: approval
|
||||
- utests_stress:
|
||||
- j8_utests_stress:
|
||||
requires:
|
||||
- start_utests_stress
|
||||
- j8_build
|
||||
- utests_stress_repeat:
|
||||
- j11_utests_stress:
|
||||
requires:
|
||||
- start_utests_stress
|
||||
- j8_build
|
||||
- j8_utests_stress_repeat:
|
||||
requires:
|
||||
- start_utests_stress
|
||||
- j8_build
|
||||
- j11_utests_stress_repeat:
|
||||
requires:
|
||||
- start_utests_stress
|
||||
- j8_build
|
||||
- start_utests_fqltool:
|
||||
type: approval
|
||||
- utests_fqltool:
|
||||
- j8_utests_fqltool:
|
||||
requires:
|
||||
- start_utests_fqltool
|
||||
- j8_build
|
||||
- utests_fqltool_repeat:
|
||||
- j11_utests_fqltool:
|
||||
requires:
|
||||
- start_utests_fqltool
|
||||
- j8_build
|
||||
- utests_system_keyspace_directory:
|
||||
- j8_utests_fqltool_repeat:
|
||||
requires:
|
||||
- start_utests_fqltool
|
||||
- j8_build
|
||||
- j11_utests_fqltool_repeat:
|
||||
requires:
|
||||
- start_utests_fqltool
|
||||
- j8_build
|
||||
- start_utests_system_keyspace_directory:
|
||||
type: approval
|
||||
- j8_utests_system_keyspace_directory:
|
||||
requires:
|
||||
- j8_build
|
||||
- utests_system_keyspace_directory_repeat:
|
||||
- j11_utests_system_keyspace_directory:
|
||||
requires:
|
||||
- start_utests_system_keyspace_directory
|
||||
- j8_build
|
||||
- j8_utests_system_keyspace_directory_repeat:
|
||||
requires:
|
||||
- j8_build
|
||||
- j11_utests_system_keyspace_directory_repeat:
|
||||
requires:
|
||||
- start_utests_system_keyspace_directory
|
||||
- j8_build
|
||||
- start_jvm_upgrade_dtests:
|
||||
type: approval
|
||||
|
|
@ -742,6 +892,79 @@ j11_separate_jobs: &j11_separate_jobs
|
|||
requires:
|
||||
- start_j11_cqlsh_tests
|
||||
- j11_build
|
||||
# specialized unit tests (all run on request)
|
||||
- start_j11_utests_long:
|
||||
type: approval
|
||||
- j11_utests_long:
|
||||
requires:
|
||||
- start_j11_utests_long
|
||||
- j11_build
|
||||
- start_j11_utests_long_repeat:
|
||||
type: approval
|
||||
- j11_utests_long_repeat:
|
||||
requires:
|
||||
- start_j11_utests_long_repeat
|
||||
- j11_build
|
||||
- start_j11_utests_cdc:
|
||||
type: approval
|
||||
- j11_utests_cdc:
|
||||
requires:
|
||||
- start_j11_utests_cdc
|
||||
- j11_build
|
||||
- start_j11_utests_cdc_repeat:
|
||||
type: approval
|
||||
- j11_utests_cdc_repeat:
|
||||
requires:
|
||||
- start_j11_utests_cdc_repeat
|
||||
- j11_build
|
||||
- start_j11_utests_compression:
|
||||
type: approval
|
||||
- j11_utests_compression:
|
||||
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_stress:
|
||||
type: approval
|
||||
- j11_utests_stress:
|
||||
requires:
|
||||
- start_j11_utests_stress
|
||||
- j11_build
|
||||
- start_j11_utests_stress_repeat:
|
||||
type: approval
|
||||
- j11_utests_stress_repeat:
|
||||
requires:
|
||||
- start_j11_utests_stress_repeat
|
||||
- j11_build
|
||||
- start_j11_utests_fqltool:
|
||||
type: approval
|
||||
- j11_utests_fqltool:
|
||||
requires:
|
||||
- start_j11_utests_fqltool
|
||||
- j11_build
|
||||
- start_j11_utests_fqltool_repeat:
|
||||
type: approval
|
||||
- j11_utests_fqltool_repeat:
|
||||
requires:
|
||||
- start_j11_utests_fqltool_repeat
|
||||
- j11_build
|
||||
- start_j11_utests_system_keyspace_directory:
|
||||
type: approval
|
||||
- j11_utests_system_keyspace_directory:
|
||||
requires:
|
||||
- start_j11_utests_system_keyspace_directory
|
||||
- j11_build
|
||||
- start_j11_utests_system_keyspace_directory_repeat:
|
||||
type: approval
|
||||
- j11_utests_system_keyspace_directory_repeat:
|
||||
requires:
|
||||
- start_j11_utests_system_keyspace_directory_repeat
|
||||
- j11_build
|
||||
# Java 11 repeated utest
|
||||
- start_j11_repeated_ant_test:
|
||||
type: approval
|
||||
|
|
@ -818,6 +1041,67 @@ j11_pre-commit_jobs: &j11_pre-commit_jobs
|
|||
- j11_cqlsh_dtests_py38_vnode:
|
||||
requires:
|
||||
- j11_build
|
||||
# specialized unit tests (all run on request)
|
||||
- start_utests_long:
|
||||
type: approval
|
||||
- j11_utests_long:
|
||||
requires:
|
||||
- start_utests_long
|
||||
- j11_build
|
||||
- j11_utests_long_repeat:
|
||||
requires:
|
||||
- start_utests_long
|
||||
- j11_build
|
||||
- start_utests_cdc:
|
||||
type: approval
|
||||
- j11_utests_cdc:
|
||||
requires:
|
||||
- start_utests_cdc
|
||||
- j11_build
|
||||
- j11_utests_cdc_repeat:
|
||||
requires:
|
||||
- start_utests_cdc
|
||||
- j11_build
|
||||
- start_utests_compression:
|
||||
type: approval
|
||||
- j11_utests_compression:
|
||||
requires:
|
||||
- start_utests_compression
|
||||
- j11_build
|
||||
- j11_utests_compression_repeat:
|
||||
requires:
|
||||
- start_utests_compression
|
||||
- j11_build
|
||||
- start_utests_stress:
|
||||
type: approval
|
||||
- j11_utests_stress:
|
||||
requires:
|
||||
- start_utests_stress
|
||||
- j11_build
|
||||
- j11_utests_stress_repeat:
|
||||
requires:
|
||||
- start_utests_stress
|
||||
- j11_build
|
||||
- start_utests_fqltool:
|
||||
type: approval
|
||||
- j11_utests_fqltool:
|
||||
requires:
|
||||
- start_utests_fqltool
|
||||
- j11_build
|
||||
- j11_utests_fqltool_repeat:
|
||||
requires:
|
||||
- start_utests_fqltool
|
||||
- j11_build
|
||||
- start_utests_system_keyspace_directory:
|
||||
type: approval
|
||||
- j11_utests_system_keyspace_directory:
|
||||
requires:
|
||||
- start_utests_system_keyspace_directory
|
||||
- j11_build
|
||||
- j11_utests_system_keyspace_directory_repeat:
|
||||
requires:
|
||||
- start_utests_system_keyspace_directory
|
||||
- j11_build
|
||||
|
||||
workflows:
|
||||
version: 2
|
||||
|
|
@ -1000,7 +1284,7 @@ jobs:
|
|||
at: /home/cassandra
|
||||
- run_cqlshlib_tests
|
||||
|
||||
utests_long:
|
||||
j8_utests_long:
|
||||
<<: *j8_seq_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
|
|
@ -1008,7 +1292,35 @@ jobs:
|
|||
- run_junit_tests:
|
||||
target: long-test
|
||||
|
||||
utests_compression:
|
||||
j11_utests_long:
|
||||
<<: *j11_seq_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- run_junit_tests:
|
||||
target: long-test
|
||||
|
||||
j8_utests_cdc:
|
||||
<<: *j8_par_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- create_junit_containers
|
||||
- log_environment
|
||||
- run_parallel_junit_tests:
|
||||
target: testclasslist-cdc
|
||||
|
||||
j11_utests_cdc:
|
||||
<<: *j11_par_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- create_junit_containers
|
||||
- log_environment
|
||||
- run_parallel_junit_tests:
|
||||
target: testclasslist-cdc
|
||||
|
||||
j8_utests_compression:
|
||||
<<: *j8_par_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
|
|
@ -1018,7 +1330,17 @@ jobs:
|
|||
- run_parallel_junit_tests:
|
||||
target: testclasslist-compression
|
||||
|
||||
utests_stress:
|
||||
j11_utests_compression:
|
||||
<<: *j11_par_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- create_junit_containers
|
||||
- log_environment
|
||||
- run_parallel_junit_tests:
|
||||
target: testclasslist-compression
|
||||
|
||||
j8_utests_stress:
|
||||
<<: *j8_seq_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
|
|
@ -1026,7 +1348,15 @@ jobs:
|
|||
- run_junit_tests:
|
||||
target: stress-test
|
||||
|
||||
utests_fqltool:
|
||||
j11_utests_stress:
|
||||
<<: *j11_seq_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- run_junit_tests:
|
||||
target: stress-test
|
||||
|
||||
j8_utests_fqltool:
|
||||
<<: *j8_seq_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
|
|
@ -1034,7 +1364,15 @@ jobs:
|
|||
- run_junit_tests:
|
||||
target: fqltool-test
|
||||
|
||||
utests_system_keyspace_directory:
|
||||
j11_utests_fqltool:
|
||||
<<: *j8_seq_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- run_junit_tests:
|
||||
target: fqltool-test
|
||||
|
||||
j8_utests_system_keyspace_directory:
|
||||
<<: *j8_par_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
|
|
@ -1044,6 +1382,16 @@ jobs:
|
|||
- run_parallel_junit_tests:
|
||||
target: testclasslist-system-keyspace-directory
|
||||
|
||||
j11_utests_system_keyspace_directory:
|
||||
<<: *j11_par_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- create_junit_containers
|
||||
- log_environment
|
||||
- run_parallel_junit_tests:
|
||||
target: testclasslist-system-keyspace-directory
|
||||
|
||||
j8_dtests_vnode:
|
||||
<<: *j8_par_executor
|
||||
steps:
|
||||
|
|
@ -1256,46 +1604,6 @@ jobs:
|
|||
- log_environment
|
||||
- run_unit_tests_repeat
|
||||
|
||||
utests_compression_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_compression_repeat
|
||||
|
||||
utests_system_keyspace_directory_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_system_keyspace_directory_repeat
|
||||
|
||||
utests_fqltool_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_fqltool_repeat
|
||||
|
||||
utests_long_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_long_repeat
|
||||
|
||||
utests_stress_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_stress_repeat
|
||||
|
||||
j11_unit_tests_repeat:
|
||||
<<: *j11_repeated_utest_executor
|
||||
steps:
|
||||
|
|
@ -1304,6 +1612,102 @@ jobs:
|
|||
- log_environment
|
||||
- run_unit_tests_repeat
|
||||
|
||||
j8_utests_cdc_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_cdc_repeat
|
||||
|
||||
j11_utests_cdc_repeat:
|
||||
<<: *j11_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_cdc_repeat
|
||||
|
||||
j8_utests_compression_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_compression_repeat
|
||||
|
||||
j11_utests_compression_repeat:
|
||||
<<: *j11_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_compression_repeat
|
||||
|
||||
j8_utests_system_keyspace_directory_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_system_keyspace_directory_repeat
|
||||
|
||||
j11_utests_system_keyspace_directory_repeat:
|
||||
<<: *j11_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_system_keyspace_directory_repeat
|
||||
|
||||
j8_utests_fqltool_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_fqltool_repeat
|
||||
|
||||
j11_utests_fqltool_repeat:
|
||||
<<: *j11_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_fqltool_repeat
|
||||
|
||||
j8_utests_long_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_long_repeat
|
||||
|
||||
j11_utests_long_repeat:
|
||||
<<: *j11_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_long_repeat
|
||||
|
||||
j8_utests_stress_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_stress_repeat
|
||||
|
||||
j11_utests_stress_repeat:
|
||||
<<: *j11_repeated_utest_executor
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
- log_environment
|
||||
- run_utests_stress_repeat
|
||||
|
||||
j8_jvm_dtests_repeat:
|
||||
<<: *j8_repeated_utest_executor
|
||||
steps:
|
||||
|
|
@ -1835,6 +2239,14 @@ commands:
|
|||
count: ${REPEATED_UTESTS_COUNT}
|
||||
stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
|
||||
|
||||
run_utests_cdc_repeat:
|
||||
steps:
|
||||
- run_repeated_utests:
|
||||
target: test-cdc
|
||||
tests: ${REPEATED_UTESTS}
|
||||
count: ${REPEATED_UTESTS_COUNT}
|
||||
stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
|
||||
|
||||
run_utests_compression_repeat:
|
||||
steps:
|
||||
- run_repeated_utests:
|
||||
|
|
@ -1945,14 +2357,25 @@ commands:
|
|||
# Put manually specified tests and automatically detected tests together, removing duplicates
|
||||
tests=$(echo <<parameters.tests>> | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
|
||||
echo "Tests to be repeated: ${tests}"
|
||||
|
||||
|
||||
# Prepare the JVM dtests vnodes argument, which is optional.
|
||||
vnodes=<<parameters.vnodes>>
|
||||
vnodes_args=""
|
||||
if [ "$vnodes" = true ] ; then
|
||||
vnodes_args="-Dtest.jvm.args='-Dcassandra.dtest.num_tokens=16'"
|
||||
fi
|
||||
|
||||
|
||||
# Prepare the testtag for the target, used by the test macro in build.xml to group the output files
|
||||
target=<<parameters.target>>
|
||||
testtag=""
|
||||
if [[ $target == "test-cdc" ]]; then
|
||||
testtag="cdc"
|
||||
elif [[ $target == "test-compression" ]]; then
|
||||
testtag="compression"
|
||||
elif [[ $target == "test-system-keyspace-directory" ]]; then
|
||||
testtag="system_keyspace_directory"
|
||||
fi
|
||||
|
||||
# Run each test class as many times as requested.
|
||||
exit_code="$?"
|
||||
for test in $tests; do
|
||||
|
|
@ -1982,7 +2405,7 @@ commands:
|
|||
fi
|
||||
|
||||
# Prepare the -Dtest.methods argument, which is optional
|
||||
if [ $method == "" ]; then
|
||||
if [[ $method == "" ]]; then
|
||||
methods_arg=""
|
||||
else
|
||||
methods_arg="-Dtest.methods=$method"
|
||||
|
|
@ -2007,7 +2430,7 @@ commands:
|
|||
mv stdout.txt $dest/${test}.txt
|
||||
|
||||
# move the XML output files
|
||||
source=build/test/output
|
||||
source=build/test/output/${testtag}
|
||||
dest=/tmp/results/repeated_utests/output/${status}/${i}
|
||||
mkdir -p $dest
|
||||
if [[ -d $source && -n "$(ls $source)" ]]; then
|
||||
|
|
@ -2015,7 +2438,7 @@ commands:
|
|||
fi
|
||||
|
||||
# move the log files
|
||||
source=build/test/logs
|
||||
source=build/test/logs/${testtag}
|
||||
dest=/tmp/results/repeated_utests/logs/${status}/${i}
|
||||
mkdir -p $dest
|
||||
if [[ -d $source && -n "$(ls $source)" ]]; then
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- config-2_1.yml 2022-10-15 12:44:53.878216263 +0100
|
||||
+++ config-2_1.yml.HIGHRES 2022-10-15 12:45:49.850511983 +0100
|
||||
--- config-2_1.yml 2022-10-25 12:28:18.966893212 +0100
|
||||
+++ config-2_1.yml.HIGHRES 2022-10-25 12:29:12.625678547 +0100
|
||||
@@ -148,14 +148,14 @@
|
||||
j8_par_executor: &j8_par_executor
|
||||
executor:
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
j8_small_executor: &j8_small_executor
|
||||
executor:
|
||||
@@ -166,62 +166,68 @@
|
||||
@@ -166,68 +166,74 @@
|
||||
j8_medium_par_executor: &j8_medium_par_executor
|
||||
executor:
|
||||
name: java8-executor
|
||||
|
|
@ -60,6 +60,13 @@
|
|||
+ exec_resource_class: xlarge
|
||||
+ parallelism: 5
|
||||
|
||||
j11_seq_executor: &j11_seq_executor
|
||||
executor:
|
||||
name: java11-executor
|
||||
- #exec_resource_class: xlarge
|
||||
+ exec_resource_class: xlarge
|
||||
parallelism: 1 # sequential, single container tests: no parallelism benefits
|
||||
|
||||
j8_repeated_utest_executor: &j8_repeated_utest_executor
|
||||
executor:
|
||||
name: java8-executor
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- config-2_1.yml 2022-10-15 12:44:53.878216263 +0100
|
||||
+++ config-2_1.yml.MIDRES 2022-10-15 12:45:49.843904887 +0100
|
||||
--- config-2_1.yml 2022-10-25 12:28:18.966893212 +0100
|
||||
+++ config-2_1.yml.MIDRES 2022-10-25 12:29:12.619201467 +0100
|
||||
@@ -148,14 +148,14 @@
|
||||
j8_par_executor: &j8_par_executor
|
||||
executor:
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
|
||||
j11_small_executor: &j11_small_executor
|
||||
executor:
|
||||
@@ -193,35 +205,47 @@
|
||||
@@ -193,41 +205,53 @@
|
||||
#exec_resource_class: medium
|
||||
parallelism: 1
|
||||
|
||||
|
|
@ -78,6 +78,13 @@
|
|||
+ 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
|
||||
|
|
@ -122,7 +129,7 @@
|
|||
|
||||
j8_separate_jobs: &j8_separate_jobs
|
||||
jobs:
|
||||
@@ -1045,7 +1069,7 @@
|
||||
@@ -1393,7 +1417,7 @@
|
||||
target: testclasslist-system-keyspace-directory
|
||||
|
||||
j8_dtests_vnode:
|
||||
|
|
@ -131,7 +138,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1059,7 +1083,7 @@
|
||||
@@ -1407,7 +1431,7 @@
|
||||
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
|
||||
|
||||
j11_dtests_vnode:
|
||||
|
|
@ -140,7 +147,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1074,7 +1098,7 @@
|
||||
@@ -1422,7 +1446,7 @@
|
||||
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
|
||||
|
||||
j8_dtests:
|
||||
|
|
@ -149,7 +156,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1088,7 +1112,7 @@
|
||||
@@ -1436,7 +1460,7 @@
|
||||
pytest_extra_args: '--skip-resource-intensive-tests'
|
||||
|
||||
j11_dtests:
|
||||
|
|
@ -158,7 +165,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1103,7 +1127,7 @@
|
||||
@@ -1451,7 +1475,7 @@
|
||||
pytest_extra_args: '--skip-resource-intensive-tests'
|
||||
|
||||
j8_upgrade_dtests:
|
||||
|
|
@ -167,7 +174,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1117,7 +1141,7 @@
|
||||
@@ -1465,7 +1489,7 @@
|
||||
pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
|
||||
|
||||
j8_cqlsh_dtests_py3_vnode:
|
||||
|
|
@ -176,7 +183,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1132,7 +1156,7 @@
|
||||
@@ -1480,7 +1504,7 @@
|
||||
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
|
||||
|
||||
j8_cqlsh_dtests_py38_vnode:
|
||||
|
|
@ -185,7 +192,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1150,7 +1174,7 @@
|
||||
@@ -1498,7 +1522,7 @@
|
||||
python_version: '3.8'
|
||||
|
||||
j8_cqlsh_dtests_py3:
|
||||
|
|
@ -194,7 +201,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1165,7 +1189,7 @@
|
||||
@@ -1513,7 +1537,7 @@
|
||||
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
|
||||
|
||||
j8_cqlsh_dtests_py38:
|
||||
|
|
@ -203,7 +210,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1183,7 +1207,7 @@
|
||||
@@ -1531,7 +1555,7 @@
|
||||
python_version: '3.8'
|
||||
|
||||
j11_cqlsh_dtests_py3_vnode:
|
||||
|
|
@ -212,7 +219,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1198,7 +1222,7 @@
|
||||
@@ -1546,7 +1570,7 @@
|
||||
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
|
||||
|
||||
j11_cqlsh_dtests_py38_vnode:
|
||||
|
|
@ -221,7 +228,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1216,7 +1240,7 @@
|
||||
@@ -1564,7 +1588,7 @@
|
||||
python_version: '3.8'
|
||||
|
||||
j11_cqlsh_dtests_py3:
|
||||
|
|
@ -230,7 +237,7 @@
|
|||
steps:
|
||||
- attach_workspace:
|
||||
at: /home/cassandra
|
||||
@@ -1231,7 +1255,7 @@
|
||||
@@ -1579,7 +1603,7 @@
|
||||
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
|
||||
|
||||
j11_cqlsh_dtests_py38:
|
||||
|
|
|
|||
2227
.circleci/config.yml
2227
.circleci/config.yml
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -259,20 +259,28 @@ delete_job()
|
|||
if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS=" )); then
|
||||
delete_job "j8_unit_tests_repeat"
|
||||
delete_job "j11_unit_tests_repeat"
|
||||
delete_job "utests_compression_repeat"
|
||||
delete_job "utests_system_keyspace_directory_repeat"
|
||||
delete_job "j8_utests_cdc_repeat"
|
||||
delete_job "j11_utests_cdc_repeat"
|
||||
delete_job "j8_utests_compression_repeat"
|
||||
delete_job "j11_utests_compression_repeat"
|
||||
delete_job "j8_utests_system_keyspace_directory_repeat"
|
||||
delete_job "j11_utests_system_keyspace_directory_repeat"
|
||||
fi
|
||||
if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_LONG=")); then
|
||||
delete_job "utests_long_repeat"
|
||||
delete_job "j8_utests_long_repeat"
|
||||
delete_job "j11_utests_long_repeat"
|
||||
fi
|
||||
if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_STRESS=")); then
|
||||
delete_job "utests_stress_repeat"
|
||||
delete_job "j8_utests_stress_repeat"
|
||||
delete_job "j11_utests_stress_repeat"
|
||||
fi
|
||||
if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_FQLTOOL=")); then
|
||||
delete_job "utests_fqltool_repeat"
|
||||
delete_job "j8_utests_fqltool_repeat"
|
||||
delete_job "j11_utests_fqltool_repeat"
|
||||
fi
|
||||
if (! (echo "$env_vars" | grep -q "REPEATED_SIMULATOR_DTESTS=")); then
|
||||
delete_job "j8_simulator_dtests_repeat"
|
||||
delete_job "j11_simulator_dtests_repeat"
|
||||
fi
|
||||
if (! (echo "$env_vars" | grep -q "REPEATED_JVM_DTESTS=")); then
|
||||
delete_job "j8_jvm_dtests_repeat"
|
||||
|
|
|
|||
Loading…
Reference in New Issue