This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit af3eea7558e4da3976def20ac78070e79f8165f3 Merge: 9490f9667d 6f431c13a6 Author: Andrés de la Peña <a.penya.gar...@gmail.com> AuthorDate: Tue Nov 8 17:50:32 2022 +0000 Merge branch 'cassandra-4.1' into trunk .circleci/config.yml.HIGHRES | 372 ------------------------------------------- .circleci/config.yml.LOWRES | 372 ------------------------------------------- .circleci/config.yml.MIDRES | 372 ------------------------------------------- .circleci/generate.sh | 125 ++++++++------- 4 files changed, 69 insertions(+), 1172 deletions(-) diff --cc .circleci/config.yml.HIGHRES index b620263dc7,33445a7b95..56d16623a8 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@@ -7255,42 -6785,6 +7201,18 @@@ workflows requires: - start_j11_utests_compression - j8_build - - start_j8_utests_compression_repeat: - type: approval - - j8_utests_compression_repeat: - requires: - - start_j8_utests_compression_repeat - - j8_build - - start_j11_utests_compression_repeat: - type: approval - - j11_utests_compression_repeat: - requires: - - start_j11_utests_compression_repeat - - j8_build + - start_j8_utests_trie: + type: approval + - j8_utests_trie: + requires: + - start_j8_utests_trie + - j8_build + - start_j11_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_j11_utests_trie + - j8_build - - start_j8_utests_trie_repeat: - type: approval - - j8_utests_trie_repeat: - requires: - - start_j8_utests_trie_repeat - - j8_build - - start_j11_utests_trie_repeat: - type: approval - - j11_utests_trie_repeat: - requires: - - start_j11_utests_trie_repeat - - j8_build - start_j8_utests_stress: type: approval - j8_utests_stress: @@@ -7575,32 -6954,6 +7382,16 @@@ requires: - start_utests_compression - j8_build - - j8_utests_compression_repeat: - requires: - - start_utests_compression - - j8_build - - j11_utests_compression_repeat: - requires: - - start_utests_compression - - j8_build + - start_utests_trie: + type: approval + - j8_utests_trie: + requires: + - start_utests_trie + - j8_build + - j11_utests_trie: + requires: + - start_utests_trie + - j8_build - - j8_utests_trie_repeat: - requires: - - start_utests_trie - - j8_build - - j11_utests_trie_repeat: - requires: - - start_utests_trie - - j8_build - start_utests_stress: type: approval - j8_utests_stress: @@@ -7832,24 -7113,6 +7551,12 @@@ requires: - start_j11_utests_compression - j11_build - - start_j11_utests_compression_repeat: - type: approval - - j11_utests_compression_repeat: - requires: - - start_j11_utests_compression_repeat - - j11_build + - start_j11_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_j11_utests_trie + - j11_build - - start_j11_utests_trie_repeat: - type: approval - - j11_utests_trie_repeat: - requires: - - start_j11_utests_trie_repeat - - j11_build - start_j11_utests_stress: type: approval - j11_utests_stress: @@@ -7985,20 -7189,6 +7633,12 @@@ requires: - start_utests_compression - j11_build - - j11_utests_compression_repeat: - requires: - - start_utests_compression - - j11_build + - start_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_utests_trie + - j11_build - - j11_utests_trie_repeat: - requires: - - start_utests_trie - - j11_build - start_utests_stress: type: approval - j11_utests_stress: diff --cc .circleci/config.yml.LOWRES index ef01153a21,64d2e8f9a9..40f3188660 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@@ -7255,42 -6785,6 +7201,18 @@@ workflows requires: - start_j11_utests_compression - j8_build - - start_j8_utests_compression_repeat: - type: approval - - j8_utests_compression_repeat: - requires: - - start_j8_utests_compression_repeat - - j8_build - - start_j11_utests_compression_repeat: - type: approval - - j11_utests_compression_repeat: - requires: - - start_j11_utests_compression_repeat - - j8_build + - start_j8_utests_trie: + type: approval + - j8_utests_trie: + requires: + - start_j8_utests_trie + - j8_build + - start_j11_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_j11_utests_trie + - j8_build - - start_j8_utests_trie_repeat: - type: approval - - j8_utests_trie_repeat: - requires: - - start_j8_utests_trie_repeat - - j8_build - - start_j11_utests_trie_repeat: - type: approval - - j11_utests_trie_repeat: - requires: - - start_j11_utests_trie_repeat - - j8_build - start_j8_utests_stress: type: approval - j8_utests_stress: @@@ -7575,32 -6954,6 +7382,16 @@@ requires: - start_utests_compression - j8_build - - j8_utests_compression_repeat: - requires: - - start_utests_compression - - j8_build - - j11_utests_compression_repeat: - requires: - - start_utests_compression - - j8_build + - start_utests_trie: + type: approval + - j8_utests_trie: + requires: + - start_utests_trie + - j8_build + - j11_utests_trie: + requires: + - start_utests_trie + - j8_build - - j8_utests_trie_repeat: - requires: - - start_utests_trie - - j8_build - - j11_utests_trie_repeat: - requires: - - start_utests_trie - - j8_build - start_utests_stress: type: approval - j8_utests_stress: @@@ -7832,24 -7113,6 +7551,12 @@@ requires: - start_j11_utests_compression - j11_build - - start_j11_utests_compression_repeat: - type: approval - - j11_utests_compression_repeat: - requires: - - start_j11_utests_compression_repeat - - j11_build + - start_j11_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_j11_utests_trie + - j11_build - - start_j11_utests_trie_repeat: - type: approval - - j11_utests_trie_repeat: - requires: - - start_j11_utests_trie_repeat - - j11_build - start_j11_utests_stress: type: approval - j11_utests_stress: @@@ -7985,20 -7189,6 +7633,12 @@@ requires: - start_utests_compression - j11_build - - j11_utests_compression_repeat: - requires: - - start_utests_compression - - j11_build + - start_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_utests_trie + - j11_build - - j11_utests_trie_repeat: - requires: - - start_utests_trie - - j11_build - start_utests_stress: type: approval - j11_utests_stress: diff --cc .circleci/config.yml.MIDRES index dc5951a076,a30ec92045..db51259047 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@@ -7255,42 -6785,6 +7201,18 @@@ workflows requires: - start_j11_utests_compression - j8_build - - start_j8_utests_compression_repeat: - type: approval - - j8_utests_compression_repeat: - requires: - - start_j8_utests_compression_repeat - - j8_build - - start_j11_utests_compression_repeat: - type: approval - - j11_utests_compression_repeat: - requires: - - start_j11_utests_compression_repeat - - j8_build + - start_j8_utests_trie: + type: approval + - j8_utests_trie: + requires: + - start_j8_utests_trie + - j8_build + - start_j11_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_j11_utests_trie + - j8_build - - start_j8_utests_trie_repeat: - type: approval - - j8_utests_trie_repeat: - requires: - - start_j8_utests_trie_repeat - - j8_build - - start_j11_utests_trie_repeat: - type: approval - - j11_utests_trie_repeat: - requires: - - start_j11_utests_trie_repeat - - j8_build - start_j8_utests_stress: type: approval - j8_utests_stress: @@@ -7575,32 -6954,6 +7382,16 @@@ requires: - start_utests_compression - j8_build - - j8_utests_compression_repeat: - requires: - - start_utests_compression - - j8_build - - j11_utests_compression_repeat: - requires: - - start_utests_compression - - j8_build + - start_utests_trie: + type: approval + - j8_utests_trie: + requires: + - start_utests_trie + - j8_build + - j11_utests_trie: + requires: + - start_utests_trie + - j8_build - - j8_utests_trie_repeat: - requires: - - start_utests_trie - - j8_build - - j11_utests_trie_repeat: - requires: - - start_utests_trie - - j8_build - start_utests_stress: type: approval - j8_utests_stress: @@@ -7832,24 -7113,6 +7551,12 @@@ requires: - start_j11_utests_compression - j11_build - - start_j11_utests_compression_repeat: - type: approval - - j11_utests_compression_repeat: - requires: - - start_j11_utests_compression_repeat - - j11_build + - start_j11_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_j11_utests_trie + - j11_build - - start_j11_utests_trie_repeat: - type: approval - - j11_utests_trie_repeat: - requires: - - start_j11_utests_trie_repeat - - j11_build - start_j11_utests_stress: type: approval - j11_utests_stress: @@@ -7985,20 -7189,6 +7633,12 @@@ requires: - start_utests_compression - j11_build - - j11_utests_compression_repeat: - requires: - - start_utests_compression - - j11_build + - start_utests_trie: + type: approval + - j11_utests_trie: + requires: + - start_utests_trie + - j11_build - - j11_utests_trie_repeat: - requires: - - start_utests_trie - - j11_build - start_utests_stress: type: approval - j11_utests_stress: diff --cc .circleci/generate.sh index 3868687228,b42e0ab339..67e530f39a --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@@ -248,62 -249,72 +249,74 @@@ 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 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org