This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-5.0 by this push: new c3a18e36d1 Minor bugs in generate.sh -d c3a18e36d1 is described below commit c3a18e36d12a9fa55aa1a0687d6a58b5ebebe768 Author: Bereng <berenguerbl...@gmail.com> AuthorDate: Tue Mar 12 08:52:53 2024 +0100 Minor bugs in generate.sh -d patch by Berenguer Blasi; reviewed by Ekaterina Dimitrova for CASSANDRA-19458 --- .circleci/config.yml | 81 ----------------------------------------------- .circleci/config.yml.FREE | 81 ----------------------------------------------- .circleci/config.yml.PAID | 81 ----------------------------------------------- .circleci/generate.sh | 47 ++++++++++++++------------- 4 files changed, 25 insertions(+), 265 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4fce7a0fef..8ac77b306c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9499,12 +9499,6 @@ workflows: requires: - start_j11_jvm_dtests_latest_vnode - j11_build - - start_j11_jvm_dtests_latest_vnode_repeat: - type: approval - - j11_jvm_dtests_latest_vnode_repeat: - requires: - - start_j11_jvm_dtests_latest_vnode_repeat - - j11_build - start_j17_jvm_dtests: type: approval - j17_jvm_dtests: @@ -9517,12 +9511,6 @@ workflows: requires: - start_j17_jvm_dtests_latest_vnode - j11_build - - start_j17_jvm_dtests_latest_vnode_repeat: - type: approval - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - start_j17_jvm_dtests_latest_vnode_repeat - - j11_build - start_j11_simulator_dtests: type: approval - j11_simulator_dtests: @@ -9619,18 +9607,6 @@ workflows: requires: - start_j17_utests_latest - j11_build - - start_j11_utests_latest_repeat: - type: approval - - j11_utests_latest_repeat: - requires: - - start_j11_utests_latest_repeat - - j11_build - - start_j17_utests_latest_repeat: - type: approval - - j17_utests_latest_repeat: - requires: - - start_j17_utests_latest_repeat - - j11_build - start_j11_utests_stress: type: approval - j11_utests_stress: @@ -9697,12 +9673,6 @@ workflows: requires: - start_j11_dtests_latest - j11_build - - start_j11_dtests_latest_repeat: - type: approval - - j11_dtests_latest_repeat: - requires: - - start_j11_dtests_latest_repeat - - j11_build - start_j17_dtests: type: approval - j17_dtests: @@ -9721,12 +9691,6 @@ workflows: requires: - start_j17_dtests_latest - j11_build - - start_j17_dtests_latest_repeat: - type: approval - - j17_dtests_latest_repeat: - requires: - - start_j17_dtests_latest_repeat - - j11_build - start_j11_dtests_large: type: approval - j11_dtests_large: @@ -9829,9 +9793,6 @@ workflows: - j11_utests_latest: requires: - j11_build - - j11_utests_latest_repeat: - requires: - - j11_build - j11_simulator_dtests: requires: - j11_build @@ -9841,18 +9802,12 @@ workflows: - j11_jvm_dtests_latest_vnode: requires: - j11_build - - j11_jvm_dtests_latest_vnode_repeat: - requires: - - j11_build - j17_jvm_dtests: requires: - j11_build - j17_jvm_dtests_latest_vnode: requires: - j11_build - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - j11_build - j11_cqlshlib_tests: requires: - j11_build @@ -9874,9 +9829,6 @@ workflows: - j17_utests_latest: requires: - j11_build - - j17_utests_latest_repeat: - requires: - - j11_build - start_utests_long: type: approval - j11_utests_long: @@ -9954,9 +9906,6 @@ workflows: - j11_dtests_latest: requires: - j11_build - - j11_dtests_latest_repeat: - requires: - - j11_build - j17_dtests: requires: - j11_build @@ -9966,9 +9915,6 @@ workflows: - j17_dtests_latest: requires: - j11_build - - j17_dtests_latest_repeat: - requires: - - j11_build - start_j11_dtests_large: type: approval - j11_dtests_large: @@ -10064,12 +10010,6 @@ workflows: requires: - start_j17_jvm_dtests_latest_vnode - j17_build - - start_j17_jvm_dtests_latest_vnode_repeat: - type: approval - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - start_j17_jvm_dtests_latest_vnode_repeat - - j17_build - start_j17_cqlshlib_tests: type: approval - j17_cqlshlib_tests: @@ -10100,12 +10040,6 @@ workflows: requires: - start_j17_dtests_latest - j17_build - - start_j17_dtests_latest_repeat: - type: approval - - j17_dtests_latest_repeat: - requires: - - start_j17_dtests_latest_repeat - - j17_build - start_j17_dtests_large: type: approval - j17_dtests_large: @@ -10176,12 +10110,6 @@ workflows: requires: - start_j17_utests_latest - j17_build - - start_j17_utests_latest_repeat: - type: approval - - j17_utests_latest_repeat: - requires: - - start_j17_utests_latest_repeat - - j17_build - start_j17_utests_stress: type: approval - j17_utests_stress: @@ -10216,18 +10144,12 @@ workflows: - j17_utests_latest: requires: - j17_build - - j17_utests_latest_repeat: - requires: - - j17_build - j17_jvm_dtests: requires: - j17_build - j17_jvm_dtests_latest_vnode: requires: - j17_build - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - j17_build - j17_cqlshlib_tests: requires: - j17_build @@ -10243,9 +10165,6 @@ workflows: - j17_dtests_latest: requires: - j17_build - - j17_dtests_latest_repeat: - requires: - - j17_build - start_j17_dtests_large: type: approval - j17_dtests_large: diff --git a/.circleci/config.yml.FREE b/.circleci/config.yml.FREE index 4fce7a0fef..8ac77b306c 100644 --- a/.circleci/config.yml.FREE +++ b/.circleci/config.yml.FREE @@ -9499,12 +9499,6 @@ workflows: requires: - start_j11_jvm_dtests_latest_vnode - j11_build - - start_j11_jvm_dtests_latest_vnode_repeat: - type: approval - - j11_jvm_dtests_latest_vnode_repeat: - requires: - - start_j11_jvm_dtests_latest_vnode_repeat - - j11_build - start_j17_jvm_dtests: type: approval - j17_jvm_dtests: @@ -9517,12 +9511,6 @@ workflows: requires: - start_j17_jvm_dtests_latest_vnode - j11_build - - start_j17_jvm_dtests_latest_vnode_repeat: - type: approval - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - start_j17_jvm_dtests_latest_vnode_repeat - - j11_build - start_j11_simulator_dtests: type: approval - j11_simulator_dtests: @@ -9619,18 +9607,6 @@ workflows: requires: - start_j17_utests_latest - j11_build - - start_j11_utests_latest_repeat: - type: approval - - j11_utests_latest_repeat: - requires: - - start_j11_utests_latest_repeat - - j11_build - - start_j17_utests_latest_repeat: - type: approval - - j17_utests_latest_repeat: - requires: - - start_j17_utests_latest_repeat - - j11_build - start_j11_utests_stress: type: approval - j11_utests_stress: @@ -9697,12 +9673,6 @@ workflows: requires: - start_j11_dtests_latest - j11_build - - start_j11_dtests_latest_repeat: - type: approval - - j11_dtests_latest_repeat: - requires: - - start_j11_dtests_latest_repeat - - j11_build - start_j17_dtests: type: approval - j17_dtests: @@ -9721,12 +9691,6 @@ workflows: requires: - start_j17_dtests_latest - j11_build - - start_j17_dtests_latest_repeat: - type: approval - - j17_dtests_latest_repeat: - requires: - - start_j17_dtests_latest_repeat - - j11_build - start_j11_dtests_large: type: approval - j11_dtests_large: @@ -9829,9 +9793,6 @@ workflows: - j11_utests_latest: requires: - j11_build - - j11_utests_latest_repeat: - requires: - - j11_build - j11_simulator_dtests: requires: - j11_build @@ -9841,18 +9802,12 @@ workflows: - j11_jvm_dtests_latest_vnode: requires: - j11_build - - j11_jvm_dtests_latest_vnode_repeat: - requires: - - j11_build - j17_jvm_dtests: requires: - j11_build - j17_jvm_dtests_latest_vnode: requires: - j11_build - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - j11_build - j11_cqlshlib_tests: requires: - j11_build @@ -9874,9 +9829,6 @@ workflows: - j17_utests_latest: requires: - j11_build - - j17_utests_latest_repeat: - requires: - - j11_build - start_utests_long: type: approval - j11_utests_long: @@ -9954,9 +9906,6 @@ workflows: - j11_dtests_latest: requires: - j11_build - - j11_dtests_latest_repeat: - requires: - - j11_build - j17_dtests: requires: - j11_build @@ -9966,9 +9915,6 @@ workflows: - j17_dtests_latest: requires: - j11_build - - j17_dtests_latest_repeat: - requires: - - j11_build - start_j11_dtests_large: type: approval - j11_dtests_large: @@ -10064,12 +10010,6 @@ workflows: requires: - start_j17_jvm_dtests_latest_vnode - j17_build - - start_j17_jvm_dtests_latest_vnode_repeat: - type: approval - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - start_j17_jvm_dtests_latest_vnode_repeat - - j17_build - start_j17_cqlshlib_tests: type: approval - j17_cqlshlib_tests: @@ -10100,12 +10040,6 @@ workflows: requires: - start_j17_dtests_latest - j17_build - - start_j17_dtests_latest_repeat: - type: approval - - j17_dtests_latest_repeat: - requires: - - start_j17_dtests_latest_repeat - - j17_build - start_j17_dtests_large: type: approval - j17_dtests_large: @@ -10176,12 +10110,6 @@ workflows: requires: - start_j17_utests_latest - j17_build - - start_j17_utests_latest_repeat: - type: approval - - j17_utests_latest_repeat: - requires: - - start_j17_utests_latest_repeat - - j17_build - start_j17_utests_stress: type: approval - j17_utests_stress: @@ -10216,18 +10144,12 @@ workflows: - j17_utests_latest: requires: - j17_build - - j17_utests_latest_repeat: - requires: - - j17_build - j17_jvm_dtests: requires: - j17_build - j17_jvm_dtests_latest_vnode: requires: - j17_build - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - j17_build - j17_cqlshlib_tests: requires: - j17_build @@ -10243,9 +10165,6 @@ workflows: - j17_dtests_latest: requires: - j17_build - - j17_dtests_latest_repeat: - requires: - - j17_build - start_j17_dtests_large: type: approval - j17_dtests_large: diff --git a/.circleci/config.yml.PAID b/.circleci/config.yml.PAID index ec24d12dcd..f32e90f63c 100644 --- a/.circleci/config.yml.PAID +++ b/.circleci/config.yml.PAID @@ -9499,12 +9499,6 @@ workflows: requires: - start_j11_jvm_dtests_latest_vnode - j11_build - - start_j11_jvm_dtests_latest_vnode_repeat: - type: approval - - j11_jvm_dtests_latest_vnode_repeat: - requires: - - start_j11_jvm_dtests_latest_vnode_repeat - - j11_build - start_j17_jvm_dtests: type: approval - j17_jvm_dtests: @@ -9517,12 +9511,6 @@ workflows: requires: - start_j17_jvm_dtests_latest_vnode - j11_build - - start_j17_jvm_dtests_latest_vnode_repeat: - type: approval - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - start_j17_jvm_dtests_latest_vnode_repeat - - j11_build - start_j11_simulator_dtests: type: approval - j11_simulator_dtests: @@ -9619,18 +9607,6 @@ workflows: requires: - start_j17_utests_latest - j11_build - - start_j11_utests_latest_repeat: - type: approval - - j11_utests_latest_repeat: - requires: - - start_j11_utests_latest_repeat - - j11_build - - start_j17_utests_latest_repeat: - type: approval - - j17_utests_latest_repeat: - requires: - - start_j17_utests_latest_repeat - - j11_build - start_j11_utests_stress: type: approval - j11_utests_stress: @@ -9697,12 +9673,6 @@ workflows: requires: - start_j11_dtests_latest - j11_build - - start_j11_dtests_latest_repeat: - type: approval - - j11_dtests_latest_repeat: - requires: - - start_j11_dtests_latest_repeat - - j11_build - start_j17_dtests: type: approval - j17_dtests: @@ -9721,12 +9691,6 @@ workflows: requires: - start_j17_dtests_latest - j11_build - - start_j17_dtests_latest_repeat: - type: approval - - j17_dtests_latest_repeat: - requires: - - start_j17_dtests_latest_repeat - - j11_build - start_j11_dtests_large: type: approval - j11_dtests_large: @@ -9829,9 +9793,6 @@ workflows: - j11_utests_latest: requires: - j11_build - - j11_utests_latest_repeat: - requires: - - j11_build - j11_simulator_dtests: requires: - j11_build @@ -9841,18 +9802,12 @@ workflows: - j11_jvm_dtests_latest_vnode: requires: - j11_build - - j11_jvm_dtests_latest_vnode_repeat: - requires: - - j11_build - j17_jvm_dtests: requires: - j11_build - j17_jvm_dtests_latest_vnode: requires: - j11_build - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - j11_build - j11_cqlshlib_tests: requires: - j11_build @@ -9874,9 +9829,6 @@ workflows: - j17_utests_latest: requires: - j11_build - - j17_utests_latest_repeat: - requires: - - j11_build - start_utests_long: type: approval - j11_utests_long: @@ -9954,9 +9906,6 @@ workflows: - j11_dtests_latest: requires: - j11_build - - j11_dtests_latest_repeat: - requires: - - j11_build - j17_dtests: requires: - j11_build @@ -9966,9 +9915,6 @@ workflows: - j17_dtests_latest: requires: - j11_build - - j17_dtests_latest_repeat: - requires: - - j11_build - start_j11_dtests_large: type: approval - j11_dtests_large: @@ -10064,12 +10010,6 @@ workflows: requires: - start_j17_jvm_dtests_latest_vnode - j17_build - - start_j17_jvm_dtests_latest_vnode_repeat: - type: approval - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - start_j17_jvm_dtests_latest_vnode_repeat - - j17_build - start_j17_cqlshlib_tests: type: approval - j17_cqlshlib_tests: @@ -10100,12 +10040,6 @@ workflows: requires: - start_j17_dtests_latest - j17_build - - start_j17_dtests_latest_repeat: - type: approval - - j17_dtests_latest_repeat: - requires: - - start_j17_dtests_latest_repeat - - j17_build - start_j17_dtests_large: type: approval - j17_dtests_large: @@ -10176,12 +10110,6 @@ workflows: requires: - start_j17_utests_latest - j17_build - - start_j17_utests_latest_repeat: - type: approval - - j17_utests_latest_repeat: - requires: - - start_j17_utests_latest_repeat - - j17_build - start_j17_utests_stress: type: approval - j17_utests_stress: @@ -10216,18 +10144,12 @@ workflows: - j17_utests_latest: requires: - j17_build - - j17_utests_latest_repeat: - requires: - - j17_build - j17_jvm_dtests: requires: - j17_build - j17_jvm_dtests_latest_vnode: requires: - j17_build - - j17_jvm_dtests_latest_vnode_repeat: - requires: - - j17_build - j17_cqlshlib_tests: requires: - j17_build @@ -10243,9 +10165,6 @@ workflows: - j17_dtests_latest: requires: - j17_build - - j17_dtests_latest_repeat: - requires: - - j17_build - start_j17_dtests_large: type: approval - j17_dtests_large: diff --git a/.circleci/generate.sh b/.circleci/generate.sh index 98cc2aec70..191f8eb1c7 100755 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@ -157,6 +157,10 @@ if $has_env_vars && $check_env_vars; then done fi +if $dev_min && $detect_changed_tests; then + die "-d doesn't support repeated tests. Use -s to skip it." +fi + if $free; then ($all || $paid) && die "Cannot use option -f with options -a or -p" echo "Generating new config.yml file for free tier from config_template.yml" @@ -282,8 +286,8 @@ delete_repeated_jobs() delete_job "$1" "j17_utests_cdc_repeat" delete_job "$1" "j11_utests_compression_repeat" delete_job "$1" "j17_utests_compression_repeat" - delete_job "$1" "j11_utests_trie_repeat" - delete_job "$1" "j17_utests_trie_repeat" + delete_job "$1" "j11_utests_latest_repeat" + delete_job "$1" "j17_utests_latest_repeat" delete_job "$1" "j11_utests_oa_repeat" delete_job "$1" "j17_utests_oa_repeat" delete_job "$1" "j11_utests_system_keyspace_directory_repeat" @@ -306,9 +310,9 @@ delete_repeated_jobs() fi if (! (echo "$env_vars" | grep -q "REPEATED_JVM_DTESTS=")); then delete_job "$1" "j11_jvm_dtests_repeat" - delete_job "$1" "j11_jvm_dtests_vnode_repeat" + delete_job "$1" "j11_jvm_dtests_latest_vnode_repeat" delete_job "$1" "j17_jvm_dtests_repeat" - delete_job "$1" "j17_jvm_dtests_vnode_repeat" + delete_job "$1" "j17_jvm_dtests_latest_vnode_repeat" fi if (! (echo "$env_vars" | grep -q "REPEATED_JVM_UPGRADE_DTESTS=")); then delete_job "$1" "start_jvm_upgrade_dtests_repeat" @@ -317,10 +321,10 @@ delete_repeated_jobs() if (! (echo "$env_vars" | grep -q "REPEATED_DTESTS=")); then delete_job "$1" "j11_dtests_repeat" delete_job "$1" "j11_dtests_vnode_repeat" - delete_job "$1" "j11_dtests_offheap_repeat" + delete_job "$1" "j11_dtests_latest_repeat" delete_job "$1" "j17_dtests_repeat" delete_job "$1" "j17_dtests_vnode_repeat" - delete_job "$1" "j17_dtests_offheap_repeat" + delete_job "$1" "j17_dtests_latest_repeat" fi if (! (echo "$env_vars" | grep -q "REPEATED_LARGE_DTESTS=")); then delete_job "$1" "j11_dtests_large_repeat" @@ -351,10 +355,10 @@ rename_workflow() # The first and only argument is the file name. build_dev_min_jobs() { - delete_job "$1" "j11_cqlsh_dtests_py311_offheap" - delete_job "$1" "j11_cqlsh_dtests_py38_offheap" - delete_job "$1" "j17_cqlsh_dtests_py311_offheap" - delete_job "$1" "j17_cqlsh_dtests_py38_offheap" + delete_job "$1" "j11_cqlsh_dtests_py311_latest" + delete_job "$1" "j11_cqlsh_dtests_py38_latest" + delete_job "$1" "j17_cqlsh_dtests_py311_latest" + delete_job "$1" "j17_cqlsh_dtests_py38_latest" delete_job "$1" "j11_cqlsh_dtests_py311_vnode" delete_job "$1" "j11_cqlsh_dtests_py38_vnode" delete_job "$1" "j11_cqlsh_dtests_py38" @@ -367,13 +371,15 @@ build_dev_min_jobs() delete_job "$1" "j17_cqlshlib_cython_tests" delete_job "$1" "j11_dtests_vnode" delete_job "$1" "j11_dtests_large_vnode" - delete_job "$1" "j11_dtests_offheap" + delete_job "$1" "j11_dtests_latest" delete_job "$1" "j17_dtests_vnode" delete_job "$1" "j17_dtests_large" delete_job "$1" "j17_dtests_large_vnode" - delete_job "$1" "j17_dtests_offheap" + delete_job "$1" "j17_dtests_latest" delete_job "$1" "j17_dtests" - delete_job "$1" "j11_jvm_dtests_vnode" + delete_job "$1" "j11_jvm_dtests_latest_vnode" + delete_job "$1" "j17_jvm_dtests_vnode" + delete_job "$1" "j17_jvm_dtests_latest_vnode" delete_job "$1" "j17_jvm_dtests_vnode" delete_job "$1" "j17_jvm_dtests" delete_job "$1" "j11_utests_oa" @@ -382,7 +388,6 @@ build_dev_min_jobs() delete_job "$1" "j11_utests_fqltool" delete_job "$1" "j11_utests_long" delete_job "$1" "j11_utests_stress" - delete_job "$1" "j11_utests_trie" delete_job "$1" "j11_utests_system_keyspace_directory" delete_job "$1" "j17_unit_tests" delete_job "$1" "j17_utests_oa" @@ -391,22 +396,20 @@ build_dev_min_jobs() delete_job "$1" "j17_utests_fqltool" delete_job "$1" "j17_utests_long" delete_job "$1" "j17_utests_stress" - delete_job "$1" "j17_utests_trie" - delete_job "$1" "j17_utests_trie" + delete_job "$1" "j11_utests_latest" + delete_job "$1" "j17_utests_latest" delete_job "$1" "j17_utests_system_keyspace_directory" - delete_job "$1" "start_utests_trie" delete_job "$1" "start_utests_system_keyspace_directory" delete_job "$1" "start_utests_stress" delete_job "$1" "start_utests_long" delete_job "$1" "start_utests_fqltool" delete_job "$1" "start_utests_compression" delete_job "$1" "start_utests_cdc" - delete_job "$1" "start_utests_trie" - delete_job "$1" "start_j17_cqlsh-dtests-offheap" - delete_job "$1" "start_j11_cqlsh_dtests_offheap" + delete_job "$1" "start_j17_cqlsh-dtests-latest" + delete_job "$1" "start_j11_cqlsh_dtests_latest" delete_job "$1" "start_j17_cqlsh_tests" - delete_job "$1" "start_j17_cqlsh_tests_offheap" - delete_job "$1" "start_j11_cqlsh_tests_offheap" + delete_job "$1" "start_j17_cqlsh_tests_latest" + delete_job "$1" "start_j11_cqlsh_tests_latest" rename_workflow "$1" "java11_pre-commit_tests" "java11_dev_tests" rename_workflow "$1" "java17_pre-commit_tests" "java17_dev_tests" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org