This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit cea850d67d5b726fe7ca9fef39c8578b46210155 Merge: 7dbbe6907b 7b7762826e Author: Andrés de la Peña <[email protected]> AuthorDate: Tue Nov 8 17:49:06 2022 +0000 Merge branch 'cassandra-3.11' into cassandra-4.0 .circleci/config.yml.HIGHRES | 315 ------------------------------------------- .circleci/config.yml.LOWRES | 315 ------------------------------------------- .circleci/config.yml.MIDRES | 315 ------------------------------------------- .circleci/generate.sh | 113 +++++++++------- 4 files changed, 63 insertions(+), 995 deletions(-) diff --cc .circleci/config.yml.HIGHRES index e027af8dd6,5c55e714c8..ea6ae1ead7 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@@ -8081,187 -2979,37 +8081,97 @@@ workflows - j8_unit_tests: requires: - start_j8_unit_tests - - build + - j8_build - - start_j8_unit_tests_repeat: - type: approval - - j8_unit_tests_repeat: - requires: - - start_j8_unit_tests_repeat - - j8_build - start_j8_jvm_dtests: type: approval - j8_jvm_dtests: requires: - start_j8_jvm_dtests - - build - - start_utests_long: + - j8_build - - start_j8_jvm_dtests_repeat: - type: approval - - j8_jvm_dtests_repeat: - requires: - - start_j8_jvm_dtests_repeat - - j8_build + - start_j8_cqlshlib_tests: type: approval - - utests_long: + - j8_cqlshlib_tests: requires: - - start_utests_long - - build - - start_utests_cdc: + - start_j8_cqlshlib_tests + - j8_build + - start_j11_unit_tests: type: approval - - utests_cdc: + - j11_unit_tests: requires: - - start_utests_cdc - - build - - start_utests_compression: + - start_j11_unit_tests + - j8_build - - start_j11_unit_tests_repeat: - type: approval - - j11_unit_tests_repeat: - requires: - - start_j11_unit_tests_repeat - - j8_build + - start_j8_utests_long: type: approval - - utests_compression: + - j8_utests_long: requires: - - start_utests_compression - - build - - start_utests_stress: + - start_j8_utests_long + - j8_build + - start_j11_utests_long: type: approval - - utests_stress: + - j11_utests_long: requires: - - start_utests_stress - - build + - start_j11_utests_long + - j8_build - - start_j8_utests_long_repeat: - type: approval - - j8_utests_long_repeat: - requires: - - start_j8_utests_long_repeat - - j8_build - - start_j11_utests_long_repeat: - type: approval - - j11_utests_long_repeat: - requires: - - start_j11_utests_long_repeat - - j8_build + - start_j8_utests_cdc: + type: approval + - j8_utests_cdc: + requires: + - start_j8_utests_cdc + - j8_build + - start_j11_utests_cdc: + type: approval + - j11_utests_cdc: + requires: + - start_j11_utests_cdc + - j8_build - - start_j8_utests_cdc_repeat: - type: approval - - j8_utests_cdc_repeat: - requires: - - start_j8_utests_cdc_repeat - - j8_build - - start_j11_utests_cdc_repeat: - type: approval - - j11_utests_cdc_repeat: - requires: - - start_j11_utests_cdc_repeat - - j8_build + - start_j8_utests_compression: + type: approval + - j8_utests_compression: + requires: + - start_j8_utests_compression + - j8_build + - start_j11_utests_compression: + type: approval + - j11_utests_compression: + 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_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 - j8_dtest_jars_build: @@@ -8285,126 -3027,20 +8189,84 @@@ - j8_dtests: requires: - start_j8_dtests - - build + - j8_build - - start_j8_dtests_repeat: - type: approval - - j8_dtests_repeat: - requires: - - start_j8_dtests_repeat - - j8_build - start_j8_dtests_vnode: type: approval - j8_dtests_vnode: requires: - start_j8_dtests_vnode - - build - - start_upgrade_dtests: + - j8_build - - start_j8_dtests_vnode_repeat: - type: approval - - j8_dtests_vnode_repeat: - requires: - - start_j8_dtests_vnode_repeat - - j8_build + - start_j11_dtests: + type: approval + - j11_dtests: + requires: + - start_j11_dtests + - j8_build - - start_j11_dtests_repeat: - type: approval - - j11_dtests_repeat: - requires: - - start_j11_dtests_repeat - - j8_build + - start_j11_dtests_vnode: + type: approval + - j11_dtests_vnode: + requires: + - start_j11_dtests_vnode + - j8_build - - start_j11_dtests_vnode_repeat: - type: approval - - j11_dtests_vnode_repeat: - requires: - - start_j11_dtests_vnode_repeat - - j8_build + - start_upgrade_tests: type: approval - j8_upgrade_dtests: requires: - - start_upgrade_dtests - - build - pre-commit_tests: + - start_upgrade_tests + - j8_build - - start_j8_upgrade_dtests_repeat: - type: approval - - j8_upgrade_dtests_repeat: - requires: - - start_j8_upgrade_dtests_repeat - - j8_build + - start_j8_cqlsh_tests: + type: approval + - j8_cqlsh-dtests-py2-with-vnodes: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py3_vnode: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py38_vnode: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh-dtests-py2-no-vnodes: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py3: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py38: + requires: + - start_j8_cqlsh_tests + - j8_build + - start_j11_cqlsh_tests: + type: approval + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py3: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py38: + requires: + - start_j11_cqlsh_tests + - j8_build - - start_j8_repeated_ant_test: - type: approval - - j8_repeated_ant_test: - requires: - - start_j8_repeated_ant_test - - j8_build - - start_j11_repeated_ant_test: - type: approval - - j11_repeated_ant_test: - requires: - - start_j11_repeated_ant_test - - j8_build + java8_pre-commit_tests: jobs: - start_pre-commit_tests: type: approval @@@ -8413,131 -3049,34 +8275,75 @@@ - start_pre-commit_tests - j8_unit_tests: requires: - - build + - j8_build - - j8_unit_tests_repeat: - requires: - - j8_build - j8_jvm_dtests: requires: - - build + - j8_build - - j8_jvm_dtests_repeat: - requires: - - j8_build + - j8_cqlshlib_tests: + requires: + - j8_build + - j11_unit_tests: + requires: + - j8_build - - j11_unit_tests_repeat: - requires: - - j8_build - start_utests_long: type: approval - - utests_long: + - j8_utests_long: + requires: + - start_utests_long + - j8_build + - j11_utests_long: requires: - start_utests_long - - build + - 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 - - utests_cdc: + - j8_utests_cdc: requires: - start_utests_cdc - - build + - 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 + - j11_utests_compression: requires: - start_utests_compression - - build + - 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 - - build + - j8_build + - 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 + - j8_utests_fqltool: + requires: + - start_utests_fqltool + - j8_build + - j11_utests_fqltool: + requires: + - start_utests_fqltool + - j8_build - - 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 + - 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 - j8_dtest_jars_build: @@@ -8547,359 -3086,15 +8353,238 @@@ - j8_jvm_upgrade_dtests: requires: - j8_dtest_jars_build - - j8_jvm_upgrade_dtests_repeat: - requires: - - j8_dtest_jars_build - j8_dtests: requires: - - build + - j8_build - - j8_dtests_repeat: - requires: - - j8_build - j8_dtests_vnode: requires: - - build + - j8_build - - j8_dtests_vnode_repeat: - requires: - - j8_build + - j11_dtests: + requires: + - j8_build - - j11_dtests_repeat: - requires: - - j8_build + - j11_dtests_vnode: + requires: + - j8_build - - j11_dtests_vnode_repeat: - requires: - - j8_build - start_upgrade_tests: type: approval - j8_upgrade_dtests: requires: + - j8_build - start_upgrade_tests - - j8_upgrade_dtests_repeat: - requires: - - j8_build - - start_upgrade_tests - - build + - j8_cqlsh-dtests-py2-with-vnodes: + requires: + - j8_build + - j8_cqlsh_dtests_py3_vnode: + requires: + - j8_build + - j8_cqlsh_dtests_py38_vnode: + requires: + - j8_build + - j8_cqlsh-dtests-py2-no-vnodes: + requires: + - j8_build + - j8_cqlsh_dtests_py3: + requires: + - j8_build + - j8_cqlsh_dtests_py38: + requires: + - j8_build + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - j8_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - j8_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - j8_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - j8_build + - j11_cqlsh_dtests_py3: + requires: + - j8_build + - j11_cqlsh_dtests_py38: + requires: + - j8_build + java11_separate_tests: + jobs: + - start_j11_build: + type: approval + - j11_build: + requires: + - start_j11_build + - start_j11_unit_tests: + type: approval + - j11_unit_tests: + requires: + - start_j11_unit_tests + - j11_build - - start_j11_unit_tests_repeat: - type: approval - - j11_unit_tests_repeat: - requires: - - start_j11_unit_tests_repeat - - j11_build + - start_j11_jvm_dtests: + type: approval + - j11_jvm_dtests: + requires: + - start_j11_jvm_dtests + - j11_build - - start_j11_jvm_dtests_repeat: - type: approval - - j11_jvm_dtests_repeat: - requires: - - start_j11_jvm_dtests_repeat - - j11_build + - start_j11_cqlshlib_tests: + type: approval + - j11_cqlshlib_tests: + requires: + - start_j11_cqlshlib_tests + - j11_build + - start_j11_dtests: + type: approval + - j11_dtests: + requires: + - start_j11_dtests + - j11_build + - start_j11_dtests_vnode: + type: approval + - j11_dtests_vnode: + requires: + - start_j11_dtests_vnode + - j11_build - - start_j11_dtests_repeat: - type: approval - - j11_dtests_repeat: - requires: - - start_j11_dtests_repeat - - j11_build - - start_j11_dtests_vnode_repeat: - type: approval - - j11_dtests_vnode_repeat: - requires: - - start_j11_dtests_vnode_repeat - - j11_build + - start_j11_cqlsh_tests: + type: approval + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py3: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py38: + requires: + - start_j11_cqlsh_tests + - j11_build + - 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 - - start_j11_repeated_ant_test: - type: approval - - j11_repeated_ant_test: - requires: - - start_j11_repeated_ant_test - - j11_build + java11_pre-commit_tests: + jobs: + - start_pre-commit_tests: + type: approval + - j11_build: + requires: + - start_pre-commit_tests + - j11_unit_tests: + requires: + - j11_build - - j11_unit_tests_repeat: - requires: - - j11_build + - j11_jvm_dtests: + requires: + - j11_build - - j11_jvm_dtests_repeat: - requires: - - j11_build + - j11_cqlshlib_tests: + requires: + - j11_build + - j11_jvm_dtests: + requires: + - j11_build + - j11_cqlshlib_tests: + requires: + - j11_build + - j11_dtests: + requires: + - j11_build - - j11_dtests_repeat: - requires: - - j11_build + - j11_dtests_vnode: + requires: + - j11_build - - j11_dtests_vnode_repeat: - requires: - - j11_build + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - j11_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - j11_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - j11_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - j11_build + - j11_cqlsh_dtests_py3: + requires: + - j11_build + - j11_cqlsh_dtests_py38: + requires: + - j11_build + - 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 diff --cc .circleci/config.yml.LOWRES index a056b63876,30046af3ca..ca564102a1 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@@ -8081,187 -2979,37 +8081,97 @@@ workflows - j8_unit_tests: requires: - start_j8_unit_tests - - build + - j8_build - - start_j8_unit_tests_repeat: - type: approval - - j8_unit_tests_repeat: - requires: - - start_j8_unit_tests_repeat - - j8_build - start_j8_jvm_dtests: type: approval - j8_jvm_dtests: requires: - start_j8_jvm_dtests - - build - - start_utests_long: + - j8_build - - start_j8_jvm_dtests_repeat: - type: approval - - j8_jvm_dtests_repeat: - requires: - - start_j8_jvm_dtests_repeat - - j8_build + - start_j8_cqlshlib_tests: type: approval - - utests_long: + - j8_cqlshlib_tests: requires: - - start_utests_long - - build - - start_utests_cdc: + - start_j8_cqlshlib_tests + - j8_build + - start_j11_unit_tests: type: approval - - utests_cdc: + - j11_unit_tests: requires: - - start_utests_cdc - - build - - start_utests_compression: + - start_j11_unit_tests + - j8_build - - start_j11_unit_tests_repeat: - type: approval - - j11_unit_tests_repeat: - requires: - - start_j11_unit_tests_repeat - - j8_build + - start_j8_utests_long: type: approval - - utests_compression: + - j8_utests_long: requires: - - start_utests_compression - - build - - start_utests_stress: + - start_j8_utests_long + - j8_build + - start_j11_utests_long: type: approval - - utests_stress: + - j11_utests_long: requires: - - start_utests_stress - - build + - start_j11_utests_long + - j8_build - - start_j8_utests_long_repeat: - type: approval - - j8_utests_long_repeat: - requires: - - start_j8_utests_long_repeat - - j8_build - - start_j11_utests_long_repeat: - type: approval - - j11_utests_long_repeat: - requires: - - start_j11_utests_long_repeat - - j8_build + - start_j8_utests_cdc: + type: approval + - j8_utests_cdc: + requires: + - start_j8_utests_cdc + - j8_build + - start_j11_utests_cdc: + type: approval + - j11_utests_cdc: + requires: + - start_j11_utests_cdc + - j8_build - - start_j8_utests_cdc_repeat: - type: approval - - j8_utests_cdc_repeat: - requires: - - start_j8_utests_cdc_repeat - - j8_build - - start_j11_utests_cdc_repeat: - type: approval - - j11_utests_cdc_repeat: - requires: - - start_j11_utests_cdc_repeat - - j8_build + - start_j8_utests_compression: + type: approval + - j8_utests_compression: + requires: + - start_j8_utests_compression + - j8_build + - start_j11_utests_compression: + type: approval + - j11_utests_compression: + 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_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 - j8_dtest_jars_build: @@@ -8285,126 -3027,20 +8189,84 @@@ - j8_dtests: requires: - start_j8_dtests - - build + - j8_build - - start_j8_dtests_repeat: - type: approval - - j8_dtests_repeat: - requires: - - start_j8_dtests_repeat - - j8_build - start_j8_dtests_vnode: type: approval - j8_dtests_vnode: requires: - start_j8_dtests_vnode - - build - - start_upgrade_dtests: + - j8_build - - start_j8_dtests_vnode_repeat: - type: approval - - j8_dtests_vnode_repeat: - requires: - - start_j8_dtests_vnode_repeat - - j8_build + - start_j11_dtests: + type: approval + - j11_dtests: + requires: + - start_j11_dtests + - j8_build - - start_j11_dtests_repeat: - type: approval - - j11_dtests_repeat: - requires: - - start_j11_dtests_repeat - - j8_build + - start_j11_dtests_vnode: + type: approval + - j11_dtests_vnode: + requires: + - start_j11_dtests_vnode + - j8_build - - start_j11_dtests_vnode_repeat: - type: approval - - j11_dtests_vnode_repeat: - requires: - - start_j11_dtests_vnode_repeat - - j8_build + - start_upgrade_tests: type: approval - j8_upgrade_dtests: requires: - - start_upgrade_dtests - - build - pre-commit_tests: + - start_upgrade_tests + - j8_build - - start_j8_upgrade_dtests_repeat: - type: approval - - j8_upgrade_dtests_repeat: - requires: - - start_j8_upgrade_dtests_repeat - - j8_build + - start_j8_cqlsh_tests: + type: approval + - j8_cqlsh-dtests-py2-with-vnodes: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py3_vnode: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py38_vnode: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh-dtests-py2-no-vnodes: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py3: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py38: + requires: + - start_j8_cqlsh_tests + - j8_build + - start_j11_cqlsh_tests: + type: approval + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py3: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py38: + requires: + - start_j11_cqlsh_tests + - j8_build - - start_j8_repeated_ant_test: - type: approval - - j8_repeated_ant_test: - requires: - - start_j8_repeated_ant_test - - j8_build - - start_j11_repeated_ant_test: - type: approval - - j11_repeated_ant_test: - requires: - - start_j11_repeated_ant_test - - j8_build + java8_pre-commit_tests: jobs: - start_pre-commit_tests: type: approval @@@ -8413,131 -3049,34 +8275,75 @@@ - start_pre-commit_tests - j8_unit_tests: requires: - - build + - j8_build - - j8_unit_tests_repeat: - requires: - - j8_build - j8_jvm_dtests: requires: - - build + - j8_build - - j8_jvm_dtests_repeat: - requires: - - j8_build + - j8_cqlshlib_tests: + requires: + - j8_build + - j11_unit_tests: + requires: + - j8_build - - j11_unit_tests_repeat: - requires: - - j8_build - start_utests_long: type: approval - - utests_long: + - j8_utests_long: + requires: + - start_utests_long + - j8_build + - j11_utests_long: requires: - start_utests_long - - build + - 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 - - utests_cdc: + - j8_utests_cdc: requires: - start_utests_cdc - - build + - 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 + - j11_utests_compression: requires: - start_utests_compression - - build + - 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 - - build + - j8_build + - 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 + - j8_utests_fqltool: + requires: + - start_utests_fqltool + - j8_build + - j11_utests_fqltool: + requires: + - start_utests_fqltool + - j8_build - - 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 + - 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 - j8_dtest_jars_build: @@@ -8547,359 -3086,15 +8353,238 @@@ - j8_jvm_upgrade_dtests: requires: - j8_dtest_jars_build - - j8_jvm_upgrade_dtests_repeat: - requires: - - j8_dtest_jars_build - j8_dtests: requires: - - build + - j8_build - - j8_dtests_repeat: - requires: - - j8_build - j8_dtests_vnode: requires: - - build + - j8_build - - j8_dtests_vnode_repeat: - requires: - - j8_build + - j11_dtests: + requires: + - j8_build - - j11_dtests_repeat: - requires: - - j8_build + - j11_dtests_vnode: + requires: + - j8_build - - j11_dtests_vnode_repeat: - requires: - - j8_build - start_upgrade_tests: type: approval - j8_upgrade_dtests: requires: + - j8_build - start_upgrade_tests - - j8_upgrade_dtests_repeat: - requires: - - j8_build - - start_upgrade_tests - - build + - j8_cqlsh-dtests-py2-with-vnodes: + requires: + - j8_build + - j8_cqlsh_dtests_py3_vnode: + requires: + - j8_build + - j8_cqlsh_dtests_py38_vnode: + requires: + - j8_build + - j8_cqlsh-dtests-py2-no-vnodes: + requires: + - j8_build + - j8_cqlsh_dtests_py3: + requires: + - j8_build + - j8_cqlsh_dtests_py38: + requires: + - j8_build + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - j8_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - j8_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - j8_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - j8_build + - j11_cqlsh_dtests_py3: + requires: + - j8_build + - j11_cqlsh_dtests_py38: + requires: + - j8_build + java11_separate_tests: + jobs: + - start_j11_build: + type: approval + - j11_build: + requires: + - start_j11_build + - start_j11_unit_tests: + type: approval + - j11_unit_tests: + requires: + - start_j11_unit_tests + - j11_build - - start_j11_unit_tests_repeat: - type: approval - - j11_unit_tests_repeat: - requires: - - start_j11_unit_tests_repeat - - j11_build + - start_j11_jvm_dtests: + type: approval + - j11_jvm_dtests: + requires: + - start_j11_jvm_dtests + - j11_build - - start_j11_jvm_dtests_repeat: - type: approval - - j11_jvm_dtests_repeat: - requires: - - start_j11_jvm_dtests_repeat - - j11_build + - start_j11_cqlshlib_tests: + type: approval + - j11_cqlshlib_tests: + requires: + - start_j11_cqlshlib_tests + - j11_build + - start_j11_dtests: + type: approval + - j11_dtests: + requires: + - start_j11_dtests + - j11_build + - start_j11_dtests_vnode: + type: approval + - j11_dtests_vnode: + requires: + - start_j11_dtests_vnode + - j11_build - - start_j11_dtests_repeat: - type: approval - - j11_dtests_repeat: - requires: - - start_j11_dtests_repeat - - j11_build - - start_j11_dtests_vnode_repeat: - type: approval - - j11_dtests_vnode_repeat: - requires: - - start_j11_dtests_vnode_repeat - - j11_build + - start_j11_cqlsh_tests: + type: approval + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py3: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py38: + requires: + - start_j11_cqlsh_tests + - j11_build + - 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 - - start_j11_repeated_ant_test: - type: approval - - j11_repeated_ant_test: - requires: - - start_j11_repeated_ant_test - - j11_build + java11_pre-commit_tests: + jobs: + - start_pre-commit_tests: + type: approval + - j11_build: + requires: + - start_pre-commit_tests + - j11_unit_tests: + requires: + - j11_build - - j11_unit_tests_repeat: - requires: - - j11_build + - j11_jvm_dtests: + requires: + - j11_build - - j11_jvm_dtests_repeat: - requires: - - j11_build + - j11_cqlshlib_tests: + requires: + - j11_build + - j11_jvm_dtests: + requires: + - j11_build + - j11_cqlshlib_tests: + requires: + - j11_build + - j11_dtests: + requires: + - j11_build - - j11_dtests_repeat: - requires: - - j11_build + - j11_dtests_vnode: + requires: + - j11_build - - j11_dtests_vnode_repeat: - requires: - - j11_build + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - j11_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - j11_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - j11_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - j11_build + - j11_cqlsh_dtests_py3: + requires: + - j11_build + - j11_cqlsh_dtests_py38: + requires: + - j11_build + - 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 diff --cc .circleci/config.yml.MIDRES index 88e6977806,3c065199df..b4c4688b54 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@@ -8081,187 -2979,37 +8081,97 @@@ workflows - j8_unit_tests: requires: - start_j8_unit_tests - - build + - j8_build - - start_j8_unit_tests_repeat: - type: approval - - j8_unit_tests_repeat: - requires: - - start_j8_unit_tests_repeat - - j8_build - start_j8_jvm_dtests: type: approval - j8_jvm_dtests: requires: - start_j8_jvm_dtests - - build - - start_utests_long: + - j8_build - - start_j8_jvm_dtests_repeat: - type: approval - - j8_jvm_dtests_repeat: - requires: - - start_j8_jvm_dtests_repeat - - j8_build + - start_j8_cqlshlib_tests: type: approval - - utests_long: + - j8_cqlshlib_tests: requires: - - start_utests_long - - build - - start_utests_cdc: + - start_j8_cqlshlib_tests + - j8_build + - start_j11_unit_tests: type: approval - - utests_cdc: + - j11_unit_tests: requires: - - start_utests_cdc - - build - - start_utests_compression: + - start_j11_unit_tests + - j8_build - - start_j11_unit_tests_repeat: - type: approval - - j11_unit_tests_repeat: - requires: - - start_j11_unit_tests_repeat - - j8_build + - start_j8_utests_long: type: approval - - utests_compression: + - j8_utests_long: requires: - - start_utests_compression - - build - - start_utests_stress: + - start_j8_utests_long + - j8_build + - start_j11_utests_long: type: approval - - utests_stress: + - j11_utests_long: requires: - - start_utests_stress - - build + - start_j11_utests_long + - j8_build - - start_j8_utests_long_repeat: - type: approval - - j8_utests_long_repeat: - requires: - - start_j8_utests_long_repeat - - j8_build - - start_j11_utests_long_repeat: - type: approval - - j11_utests_long_repeat: - requires: - - start_j11_utests_long_repeat - - j8_build + - start_j8_utests_cdc: + type: approval + - j8_utests_cdc: + requires: + - start_j8_utests_cdc + - j8_build + - start_j11_utests_cdc: + type: approval + - j11_utests_cdc: + requires: + - start_j11_utests_cdc + - j8_build - - start_j8_utests_cdc_repeat: - type: approval - - j8_utests_cdc_repeat: - requires: - - start_j8_utests_cdc_repeat - - j8_build - - start_j11_utests_cdc_repeat: - type: approval - - j11_utests_cdc_repeat: - requires: - - start_j11_utests_cdc_repeat - - j8_build + - start_j8_utests_compression: + type: approval + - j8_utests_compression: + requires: + - start_j8_utests_compression + - j8_build + - start_j11_utests_compression: + type: approval + - j11_utests_compression: + 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_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 - j8_dtest_jars_build: @@@ -8285,126 -3027,20 +8189,84 @@@ - j8_dtests: requires: - start_j8_dtests - - build + - j8_build - - start_j8_dtests_repeat: - type: approval - - j8_dtests_repeat: - requires: - - start_j8_dtests_repeat - - j8_build - start_j8_dtests_vnode: type: approval - j8_dtests_vnode: requires: - start_j8_dtests_vnode - - build - - start_upgrade_dtests: + - j8_build - - start_j8_dtests_vnode_repeat: - type: approval - - j8_dtests_vnode_repeat: - requires: - - start_j8_dtests_vnode_repeat - - j8_build + - start_j11_dtests: + type: approval + - j11_dtests: + requires: + - start_j11_dtests + - j8_build - - start_j11_dtests_repeat: - type: approval - - j11_dtests_repeat: - requires: - - start_j11_dtests_repeat - - j8_build + - start_j11_dtests_vnode: + type: approval + - j11_dtests_vnode: + requires: + - start_j11_dtests_vnode + - j8_build - - start_j11_dtests_vnode_repeat: - type: approval - - j11_dtests_vnode_repeat: - requires: - - start_j11_dtests_vnode_repeat - - j8_build + - start_upgrade_tests: type: approval - j8_upgrade_dtests: requires: - - start_upgrade_dtests - - build - pre-commit_tests: + - start_upgrade_tests + - j8_build - - start_j8_upgrade_dtests_repeat: - type: approval - - j8_upgrade_dtests_repeat: - requires: - - start_j8_upgrade_dtests_repeat - - j8_build + - start_j8_cqlsh_tests: + type: approval + - j8_cqlsh-dtests-py2-with-vnodes: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py3_vnode: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py38_vnode: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh-dtests-py2-no-vnodes: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py3: + requires: + - start_j8_cqlsh_tests + - j8_build + - j8_cqlsh_dtests_py38: + requires: + - start_j8_cqlsh_tests + - j8_build + - start_j11_cqlsh_tests: + type: approval + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py3: + requires: + - start_j11_cqlsh_tests + - j8_build + - j11_cqlsh_dtests_py38: + requires: + - start_j11_cqlsh_tests + - j8_build - - start_j8_repeated_ant_test: - type: approval - - j8_repeated_ant_test: - requires: - - start_j8_repeated_ant_test - - j8_build - - start_j11_repeated_ant_test: - type: approval - - j11_repeated_ant_test: - requires: - - start_j11_repeated_ant_test - - j8_build + java8_pre-commit_tests: jobs: - start_pre-commit_tests: type: approval @@@ -8413,131 -3049,34 +8275,75 @@@ - start_pre-commit_tests - j8_unit_tests: requires: - - build + - j8_build - - j8_unit_tests_repeat: - requires: - - j8_build - j8_jvm_dtests: requires: - - build + - j8_build - - j8_jvm_dtests_repeat: - requires: - - j8_build + - j8_cqlshlib_tests: + requires: + - j8_build + - j11_unit_tests: + requires: + - j8_build - - j11_unit_tests_repeat: - requires: - - j8_build - start_utests_long: type: approval - - utests_long: + - j8_utests_long: + requires: + - start_utests_long + - j8_build + - j11_utests_long: requires: - start_utests_long - - build + - 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 - - utests_cdc: + - j8_utests_cdc: requires: - start_utests_cdc - - build + - 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 + - j11_utests_compression: requires: - start_utests_compression - - build + - 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 - - build + - j8_build + - 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 + - j8_utests_fqltool: + requires: + - start_utests_fqltool + - j8_build + - j11_utests_fqltool: + requires: + - start_utests_fqltool + - j8_build - - 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 + - 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 - j8_dtest_jars_build: @@@ -8547,359 -3086,15 +8353,238 @@@ - j8_jvm_upgrade_dtests: requires: - j8_dtest_jars_build - - j8_jvm_upgrade_dtests_repeat: - requires: - - j8_dtest_jars_build - j8_dtests: requires: - - build + - j8_build - - j8_dtests_repeat: - requires: - - j8_build - j8_dtests_vnode: requires: - - build + - j8_build - - j8_dtests_vnode_repeat: - requires: - - j8_build + - j11_dtests: + requires: + - j8_build - - j11_dtests_repeat: - requires: - - j8_build + - j11_dtests_vnode: + requires: + - j8_build - - j11_dtests_vnode_repeat: - requires: - - j8_build - start_upgrade_tests: type: approval - j8_upgrade_dtests: requires: + - j8_build - start_upgrade_tests - - j8_upgrade_dtests_repeat: - requires: - - j8_build - - start_upgrade_tests - - build + - j8_cqlsh-dtests-py2-with-vnodes: + requires: + - j8_build + - j8_cqlsh_dtests_py3_vnode: + requires: + - j8_build + - j8_cqlsh_dtests_py38_vnode: + requires: + - j8_build + - j8_cqlsh-dtests-py2-no-vnodes: + requires: + - j8_build + - j8_cqlsh_dtests_py3: + requires: + - j8_build + - j8_cqlsh_dtests_py38: + requires: + - j8_build + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - j8_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - j8_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - j8_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - j8_build + - j11_cqlsh_dtests_py3: + requires: + - j8_build + - j11_cqlsh_dtests_py38: + requires: + - j8_build + java11_separate_tests: + jobs: + - start_j11_build: + type: approval + - j11_build: + requires: + - start_j11_build + - start_j11_unit_tests: + type: approval + - j11_unit_tests: + requires: + - start_j11_unit_tests + - j11_build - - start_j11_unit_tests_repeat: - type: approval - - j11_unit_tests_repeat: - requires: - - start_j11_unit_tests_repeat - - j11_build + - start_j11_jvm_dtests: + type: approval + - j11_jvm_dtests: + requires: + - start_j11_jvm_dtests + - j11_build - - start_j11_jvm_dtests_repeat: - type: approval - - j11_jvm_dtests_repeat: - requires: - - start_j11_jvm_dtests_repeat - - j11_build + - start_j11_cqlshlib_tests: + type: approval + - j11_cqlshlib_tests: + requires: + - start_j11_cqlshlib_tests + - j11_build + - start_j11_dtests: + type: approval + - j11_dtests: + requires: + - start_j11_dtests + - j11_build + - start_j11_dtests_vnode: + type: approval + - j11_dtests_vnode: + requires: + - start_j11_dtests_vnode + - j11_build - - start_j11_dtests_repeat: - type: approval - - j11_dtests_repeat: - requires: - - start_j11_dtests_repeat - - j11_build - - start_j11_dtests_vnode_repeat: - type: approval - - j11_dtests_vnode_repeat: - requires: - - start_j11_dtests_vnode_repeat - - j11_build + - start_j11_cqlsh_tests: + type: approval + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py3: + requires: + - start_j11_cqlsh_tests + - j11_build + - j11_cqlsh_dtests_py38: + requires: + - start_j11_cqlsh_tests + - j11_build + - 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 - - start_j11_repeated_ant_test: - type: approval - - j11_repeated_ant_test: - requires: - - start_j11_repeated_ant_test - - j11_build + java11_pre-commit_tests: + jobs: + - start_pre-commit_tests: + type: approval + - j11_build: + requires: + - start_pre-commit_tests + - j11_unit_tests: + requires: + - j11_build - - j11_unit_tests_repeat: - requires: - - j11_build + - j11_jvm_dtests: + requires: + - j11_build - - j11_jvm_dtests_repeat: - requires: - - j11_build + - j11_cqlshlib_tests: + requires: + - j11_build + - j11_jvm_dtests: + requires: + - j11_build + - j11_cqlshlib_tests: + requires: + - j11_build + - j11_dtests: + requires: + - j11_build - - j11_dtests_repeat: - requires: - - j11_build + - j11_dtests_vnode: + requires: + - j11_build - - j11_dtests_vnode_repeat: - requires: - - j11_build + - j11_cqlsh-dtests-py2-with-vnodes: + requires: + - j11_build + - j11_cqlsh_dtests_py3_vnode: + requires: + - j11_build + - j11_cqlsh_dtests_py38_vnode: + requires: + - j11_build + - j11_cqlsh-dtests-py2-no-vnodes: + requires: + - j11_build + - j11_cqlsh_dtests_py3: + requires: + - j11_build + - j11_cqlsh_dtests_py38: + requires: + - j11_build + - 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 diff --cc .circleci/generate.sh index 304d968822,79bba91d2f..dc570118ca --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@@ -241,56 -237,59 +242,68 @@@ delete_job( { delete_yaml_block() { - sed -Ei.bak "/^ - ${1}/,/^ [^[:space:]]+|^ [^[:space:]]+/{//!d;}" $BASEDIR/config.yml - sed -Ei.bak "/^ - ${1}/d" $BASEDIR/config.yml + sed -Ei.bak "/^ - ${2}/,/^ [^[:space:]]+|^ [^[:space:]]+/{//!d;}" "$1" + sed -Ei.bak "/^ - ${2}/d" "$1" } - delete_yaml_block "${1}" - delete_yaml_block "start_${1}" + file="$BASEDIR/$1" + delete_yaml_block "$file" "${2}" + delete_yaml_block "$file" "start_${2}" } - # removed unneeded repeated jobs - if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS=" )); then - delete_job "j8_unit_tests_repeat" - delete_job "j11_unit_tests_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 "j8_utests_long_repeat" - delete_job "j11_utests_long_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_STRESS=")); then - 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 "j8_utests_fqltool_repeat" - delete_job "j11_utests_fqltool_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_JVM_DTESTS=")); then - delete_job "j8_jvm_dtests_repeat" - delete_job "j8_jvm_dtests_vnode_repeat" - delete_job "j11_jvm_dtests_repeat" - delete_job "j11_jvm_dtests_vnode_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_JVM_UPGRADE_DTESTS=")); then - delete_job "start_jvm_upgrade_dtests_repeat" - delete_job "j8_jvm_upgrade_dtests_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_DTESTS=")); then - delete_job "j8_dtests_repeat" - delete_job "j8_dtests_vnode_repeat" - delete_job "j11_dtests_repeat" - delete_job "j11_dtests_vnode_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_UPGRADE_DTESTS=")); then - delete_job "j8_upgrade_dtests_repeat" - fi - if (! (echo "$env_vars" | grep -q "REPEATED_ANT_TEST_CLASS=")); then - delete_job "j8_repeated_ant_test" - delete_job "j11_repeated_ant_test" + # Define function to remove any unneeded repeated jobs. + # The first and only argument is the file name. + delete_repeated_jobs() + { + if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS=" )); then + delete_job "$1" "j8_unit_tests_repeat" + delete_job "$1" "j11_unit_tests_repeat" - delete_job "$1" "utests_cdc_repeat" - delete_job "$1" "utests_compression_repeat" - delete_job "$1" "utests_system_keyspace_directory_repeat" ++ delete_job "$1" "j8_utests_cdc_repeat" ++ delete_job "$1" "j11_utests_cdc_repeat" ++ delete_job "$1" "j8_utests_compression_repeat" ++ delete_job "$1" "j11_utests_compression_repeat" ++ delete_job "$1" "j8_utests_system_keyspace_directory_repeat" ++ delete_job "$1" "j11_utests_system_keyspace_directory_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_LONG=")); then - delete_job "$1" "utests_long_repeat" ++ delete_job "$1" "j8_utests_long_repeat" ++ delete_job "$1" "j11_utests_long_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_STRESS=")); then - delete_job "$1" "utests_stress_repeat" ++ delete_job "$1" "j8_utests_stress_repeat" ++ delete_job "$1" "j11_utests_stress_repeat" ++ fi ++ if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_FQLTOOL=")); then ++ delete_job "$1" "j8_utests_fqltool_repeat" ++ delete_job "$1" "j11_utests_fqltool_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_JVM_DTESTS=")); then + delete_job "$1" "j8_jvm_dtests_repeat" + delete_job "$1" "j8_jvm_dtests_vnode_repeat" + delete_job "$1" "j11_jvm_dtests_repeat" + delete_job "$1" "j11_jvm_dtests_vnode_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_JVM_UPGRADE_DTESTS=")); then + delete_job "$1" "start_jvm_upgrade_dtests_repeat" + delete_job "$1" "j8_jvm_upgrade_dtests_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_DTESTS=")); then + delete_job "$1" "j8_dtests_repeat" + delete_job "$1" "j8_dtests_vnode_repeat" + delete_job "$1" "j11_dtests_repeat" + delete_job "$1" "j11_dtests_vnode_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_UPGRADE_DTESTS=")); then + delete_job "$1" "j8_upgrade_dtests_repeat" + fi + if (! (echo "$env_vars" | grep -q "REPEATED_ANT_TEST_CLASS=")); then + delete_job "$1" "j8_repeated_ant_test" + delete_job "$1" "j11_repeated_ant_test" + fi + } + + delete_repeated_jobs "config.yml" + if $all; then + delete_repeated_jobs "config.yml.LOWRES" + delete_repeated_jobs "config.yml.MIDRES" + delete_repeated_jobs "config.yml.HIGHRES" fi --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
