diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES index b620263dc7..56d16623a8 100644 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@ -7135,12 +7135,6 @@ workflows: requires: - start_j8_unit_tests - 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: @@ -7153,30 +7147,12 @@ workflows: requires: - start_j8_jvm_dtests_vnode - j8_build - - start_j8_jvm_dtests_repeat: - type: approval - - j8_jvm_dtests_repeat: - requires: - - start_j8_jvm_dtests_repeat - - j8_build - - start_j8_jvm_dtests_vnode_repeat: - type: approval - - j8_jvm_dtests_vnode_repeat: - requires: - - start_j8_jvm_dtests_vnode_repeat - - j8_build - start_j8_simulator_dtests: type: approval - j8_simulator_dtests: requires: - start_j8_simulator_dtests - j8_build - - start_j8_simulator_dtests_repeat: - type: approval - - j8_simulator_dtests_repeat: - requires: - - start_j8_simulator_dtests_repeat - - j8_build - start_j8_cqlshlib_tests: type: approval - j8_cqlshlib_tests: @@ -7189,12 +7165,6 @@ workflows: requires: - 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 - j8_utests_long: @@ -7207,18 +7177,6 @@ workflows: requires: - 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: @@ -7231,18 +7189,6 @@ workflows: 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: @@ -7255,18 +7201,6 @@ 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: @@ -7279,18 +7213,6 @@ workflows: 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: @@ -7303,18 +7225,6 @@ workflows: 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: @@ -7327,18 +7237,6 @@ workflows: 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: @@ -7351,18 +7249,6 @@ workflows: 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: @@ -7375,12 +7261,6 @@ workflows: requires: - start_jvm_upgrade_dtests - j8_dtest_jars_build - - start_jvm_upgrade_dtests_repeat: - type: approval - - j8_jvm_upgrade_dtests_repeat: - requires: - - start_jvm_upgrade_dtests_repeat - - j8_dtest_jars_build - start_j8_dtests: type: approval - j8_dtests: @@ -7447,48 +7327,6 @@ workflows: 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 - - start_j8_dtests_repeat: - type: approval - - j8_dtests_repeat: - requires: - - start_j8_dtests_repeat - - j8_build - - start_j8_dtests_vnode_repeat: - type: approval - - j8_dtests_vnode_repeat: - requires: - - start_j8_dtests_vnode_repeat - - j8_build - - start_j11_dtests_repeat: - type: approval - - j11_dtests_repeat: - requires: - - start_j11_dtests_repeat - - j8_build - - start_j11_dtests_vnode_repeat: - type: approval - - j11_dtests_vnode_repeat: - requires: - - start_j11_dtests_vnode_repeat - - j8_build - - start_j8_upgrade_dtests_repeat: - type: approval - - j8_upgrade_dtests_repeat: - requires: - - start_j8_upgrade_dtests_repeat - - j8_build java8_pre-commit_tests: jobs: - start_pre-commit_tests: @@ -7499,36 +7337,21 @@ workflows: - j8_unit_tests: requires: - j8_build - - j8_unit_tests_repeat: - requires: - - j8_build - j8_simulator_dtests: requires: - j8_build - - j8_simulator_dtests_repeat: - requires: - - j8_build - j8_jvm_dtests: requires: - j8_build - - j8_jvm_dtests_repeat: - requires: - - j8_build - j8_jvm_dtests_vnode: requires: - j8_build - - j8_jvm_dtests_vnode_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 - j8_utests_long: @@ -7539,14 +7362,6 @@ workflows: 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: @@ -7557,14 +7372,6 @@ workflows: 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 - j8_utests_compression: @@ -7575,14 +7382,6 @@ workflows: 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: @@ -7593,14 +7392,6 @@ workflows: 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: @@ -7611,14 +7402,6 @@ workflows: 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: @@ -7629,14 +7412,6 @@ workflows: 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: @@ -7646,13 +7421,6 @@ workflows: 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: @@ -7662,43 +7430,24 @@ workflows: - j8_jvm_upgrade_dtests: requires: - j8_dtest_jars_build - - j8_jvm_upgrade_dtests_repeat: - requires: - - j8_dtest_jars_build - j8_dtests: requires: - j8_build - - j8_dtests_repeat: - requires: - - j8_build - j8_dtests_vnode: requires: - 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_dtests: type: approval - j8_upgrade_dtests: requires: - j8_build - start_upgrade_dtests - - j8_upgrade_dtests_repeat: - requires: - - j8_build - - start_upgrade_dtests - j8_cqlsh_dtests_py3: requires: - j8_build @@ -7736,12 +7485,6 @@ workflows: 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: @@ -7754,18 +7497,6 @@ workflows: 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_cqlshlib_tests: type: approval - j11_cqlshlib_tests: @@ -7808,102 +7539,42 @@ workflows: 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_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: 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 - - 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 java11_pre-commit_tests: jobs: - start_pre-commit_tests: @@ -7914,21 +7585,12 @@ workflows: - 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_jvm_dtests_vnode: requires: - j11_build - - j11_jvm_dtests_vnode_repeat: - requires: - - j11_build - j11_cqlshlib_tests: requires: - j11_build @@ -7938,15 +7600,9 @@ workflows: - 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_py3: requires: - j11_build @@ -7965,67 +7621,39 @@ workflows: 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_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: 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 --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES index ef01153a21..40f3188660 100644 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@ -7135,12 +7135,6 @@ workflows: requires: - start_j8_unit_tests - 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: @@ -7153,30 +7147,12 @@ workflows: requires: - start_j8_jvm_dtests_vnode - j8_build - - start_j8_jvm_dtests_repeat: - type: approval - - j8_jvm_dtests_repeat: - requires: - - start_j8_jvm_dtests_repeat - - j8_build - - start_j8_jvm_dtests_vnode_repeat: - type: approval - - j8_jvm_dtests_vnode_repeat: - requires: - - start_j8_jvm_dtests_vnode_repeat - - j8_build - start_j8_simulator_dtests: type: approval - j8_simulator_dtests: requires: - start_j8_simulator_dtests - j8_build - - start_j8_simulator_dtests_repeat: - type: approval - - j8_simulator_dtests_repeat: - requires: - - start_j8_simulator_dtests_repeat - - j8_build - start_j8_cqlshlib_tests: type: approval - j8_cqlshlib_tests: @@ -7189,12 +7165,6 @@ workflows: requires: - 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 - j8_utests_long: @@ -7207,18 +7177,6 @@ workflows: requires: - 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: @@ -7231,18 +7189,6 @@ workflows: 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: @@ -7255,18 +7201,6 @@ 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: @@ -7279,18 +7213,6 @@ workflows: 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: @@ -7303,18 +7225,6 @@ workflows: 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: @@ -7327,18 +7237,6 @@ workflows: 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: @@ -7351,18 +7249,6 @@ workflows: 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: @@ -7375,12 +7261,6 @@ workflows: requires: - start_jvm_upgrade_dtests - j8_dtest_jars_build - - start_jvm_upgrade_dtests_repeat: - type: approval - - j8_jvm_upgrade_dtests_repeat: - requires: - - start_jvm_upgrade_dtests_repeat - - j8_dtest_jars_build - start_j8_dtests: type: approval - j8_dtests: @@ -7447,48 +7327,6 @@ workflows: 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 - - start_j8_dtests_repeat: - type: approval - - j8_dtests_repeat: - requires: - - start_j8_dtests_repeat - - j8_build - - start_j8_dtests_vnode_repeat: - type: approval - - j8_dtests_vnode_repeat: - requires: - - start_j8_dtests_vnode_repeat - - j8_build - - start_j11_dtests_repeat: - type: approval - - j11_dtests_repeat: - requires: - - start_j11_dtests_repeat - - j8_build - - start_j11_dtests_vnode_repeat: - type: approval - - j11_dtests_vnode_repeat: - requires: - - start_j11_dtests_vnode_repeat - - j8_build - - start_j8_upgrade_dtests_repeat: - type: approval - - j8_upgrade_dtests_repeat: - requires: - - start_j8_upgrade_dtests_repeat - - j8_build java8_pre-commit_tests: jobs: - start_pre-commit_tests: @@ -7499,36 +7337,21 @@ workflows: - j8_unit_tests: requires: - j8_build - - j8_unit_tests_repeat: - requires: - - j8_build - j8_simulator_dtests: requires: - j8_build - - j8_simulator_dtests_repeat: - requires: - - j8_build - j8_jvm_dtests: requires: - j8_build - - j8_jvm_dtests_repeat: - requires: - - j8_build - j8_jvm_dtests_vnode: requires: - j8_build - - j8_jvm_dtests_vnode_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 - j8_utests_long: @@ -7539,14 +7362,6 @@ workflows: 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: @@ -7557,14 +7372,6 @@ workflows: 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 - j8_utests_compression: @@ -7575,14 +7382,6 @@ workflows: 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: @@ -7593,14 +7392,6 @@ workflows: 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: @@ -7611,14 +7402,6 @@ workflows: 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: @@ -7629,14 +7412,6 @@ workflows: 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: @@ -7646,13 +7421,6 @@ workflows: 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: @@ -7662,43 +7430,24 @@ workflows: - j8_jvm_upgrade_dtests: requires: - j8_dtest_jars_build - - j8_jvm_upgrade_dtests_repeat: - requires: - - j8_dtest_jars_build - j8_dtests: requires: - j8_build - - j8_dtests_repeat: - requires: - - j8_build - j8_dtests_vnode: requires: - 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_dtests: type: approval - j8_upgrade_dtests: requires: - j8_build - start_upgrade_dtests - - j8_upgrade_dtests_repeat: - requires: - - j8_build - - start_upgrade_dtests - j8_cqlsh_dtests_py3: requires: - j8_build @@ -7736,12 +7485,6 @@ workflows: 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: @@ -7754,18 +7497,6 @@ workflows: 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_cqlshlib_tests: type: approval - j11_cqlshlib_tests: @@ -7808,102 +7539,42 @@ workflows: 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_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: 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 - - 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 java11_pre-commit_tests: jobs: - start_pre-commit_tests: @@ -7914,21 +7585,12 @@ workflows: - 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_jvm_dtests_vnode: requires: - j11_build - - j11_jvm_dtests_vnode_repeat: - requires: - - j11_build - j11_cqlshlib_tests: requires: - j11_build @@ -7938,15 +7600,9 @@ workflows: - 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_py3: requires: - j11_build @@ -7965,67 +7621,39 @@ workflows: 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_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: 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 --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES index dc5951a076..db51259047 100644 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@ -7135,12 +7135,6 @@ workflows: requires: - start_j8_unit_tests - 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: @@ -7153,30 +7147,12 @@ workflows: requires: - start_j8_jvm_dtests_vnode - j8_build - - start_j8_jvm_dtests_repeat: - type: approval - - j8_jvm_dtests_repeat: - requires: - - start_j8_jvm_dtests_repeat - - j8_build - - start_j8_jvm_dtests_vnode_repeat: - type: approval - - j8_jvm_dtests_vnode_repeat: - requires: - - start_j8_jvm_dtests_vnode_repeat - - j8_build - start_j8_simulator_dtests: type: approval - j8_simulator_dtests: requires: - start_j8_simulator_dtests - j8_build - - start_j8_simulator_dtests_repeat: - type: approval - - j8_simulator_dtests_repeat: - requires: - - start_j8_simulator_dtests_repeat - - j8_build - start_j8_cqlshlib_tests: type: approval - j8_cqlshlib_tests: @@ -7189,12 +7165,6 @@ workflows: requires: - 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 - j8_utests_long: @@ -7207,18 +7177,6 @@ workflows: requires: - 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: @@ -7231,18 +7189,6 @@ workflows: 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: @@ -7255,18 +7201,6 @@ 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: @@ -7279,18 +7213,6 @@ workflows: 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: @@ -7303,18 +7225,6 @@ workflows: 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: @@ -7327,18 +7237,6 @@ workflows: 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: @@ -7351,18 +7249,6 @@ workflows: 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: @@ -7375,12 +7261,6 @@ workflows: requires: - start_jvm_upgrade_dtests - j8_dtest_jars_build - - start_jvm_upgrade_dtests_repeat: - type: approval - - j8_jvm_upgrade_dtests_repeat: - requires: - - start_jvm_upgrade_dtests_repeat - - j8_dtest_jars_build - start_j8_dtests: type: approval - j8_dtests: @@ -7447,48 +7327,6 @@ workflows: 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 - - start_j8_dtests_repeat: - type: approval - - j8_dtests_repeat: - requires: - - start_j8_dtests_repeat - - j8_build - - start_j8_dtests_vnode_repeat: - type: approval - - j8_dtests_vnode_repeat: - requires: - - start_j8_dtests_vnode_repeat - - j8_build - - start_j11_dtests_repeat: - type: approval - - j11_dtests_repeat: - requires: - - start_j11_dtests_repeat - - j8_build - - start_j11_dtests_vnode_repeat: - type: approval - - j11_dtests_vnode_repeat: - requires: - - start_j11_dtests_vnode_repeat - - j8_build - - start_j8_upgrade_dtests_repeat: - type: approval - - j8_upgrade_dtests_repeat: - requires: - - start_j8_upgrade_dtests_repeat - - j8_build java8_pre-commit_tests: jobs: - start_pre-commit_tests: @@ -7499,36 +7337,21 @@ workflows: - j8_unit_tests: requires: - j8_build - - j8_unit_tests_repeat: - requires: - - j8_build - j8_simulator_dtests: requires: - j8_build - - j8_simulator_dtests_repeat: - requires: - - j8_build - j8_jvm_dtests: requires: - j8_build - - j8_jvm_dtests_repeat: - requires: - - j8_build - j8_jvm_dtests_vnode: requires: - j8_build - - j8_jvm_dtests_vnode_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 - j8_utests_long: @@ -7539,14 +7362,6 @@ workflows: 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: @@ -7557,14 +7372,6 @@ workflows: 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 - j8_utests_compression: @@ -7575,14 +7382,6 @@ workflows: 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: @@ -7593,14 +7392,6 @@ workflows: 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: @@ -7611,14 +7402,6 @@ workflows: 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: @@ -7629,14 +7412,6 @@ workflows: 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: @@ -7646,13 +7421,6 @@ workflows: 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: @@ -7662,43 +7430,24 @@ workflows: - j8_jvm_upgrade_dtests: requires: - j8_dtest_jars_build - - j8_jvm_upgrade_dtests_repeat: - requires: - - j8_dtest_jars_build - j8_dtests: requires: - j8_build - - j8_dtests_repeat: - requires: - - j8_build - j8_dtests_vnode: requires: - 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_dtests: type: approval - j8_upgrade_dtests: requires: - j8_build - start_upgrade_dtests - - j8_upgrade_dtests_repeat: - requires: - - j8_build - - start_upgrade_dtests - j8_cqlsh_dtests_py3: requires: - j8_build @@ -7736,12 +7485,6 @@ workflows: 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: @@ -7754,18 +7497,6 @@ workflows: 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_cqlshlib_tests: type: approval - j11_cqlshlib_tests: @@ -7808,102 +7539,42 @@ workflows: 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_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: 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 - - 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 java11_pre-commit_tests: jobs: - start_pre-commit_tests: @@ -7914,21 +7585,12 @@ workflows: - 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_jvm_dtests_vnode: requires: - j11_build - - j11_jvm_dtests_vnode_repeat: - requires: - - j11_build - j11_cqlshlib_tests: requires: - j11_build @@ -7938,15 +7600,9 @@ workflows: - 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_py3: requires: - j11_build @@ -7965,67 +7621,39 @@ workflows: 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_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: 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 --git a/.circleci/generate.sh b/.circleci/generate.sh index 3868687228..67e530f39a 100755 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@ -243,67 +243,80 @@ if $has_env_vars; then unset IFS fi -# define function to remove unneeded jobs +# Define function to remove unneeded jobs. +# The first argument is the file name, and the second arguemnt is the job name. 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_trie_repeat" - delete_job "j11_utests_trie_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_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" - 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" "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_trie_repeat" + delete_job "$1" "j11_utests_trie_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" "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" "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_SIMULATOR_DTESTS=")); then + delete_job "$1" "j8_simulator_dtests_repeat" + delete_job "$1" "j11_simulator_dtests_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