[cassandra] branch cassandra-3.0 updated: ninja-fix: Fix bashisms on .circleci/generate.sh

[ad...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
     new 2b511c5714 ninja-fix: Fix bashisms on .circleci/generate.sh
2b511c5714 is described below

commit 2b511c57143063553fe1256679d5ce8aefc50129
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Wed Oct 19 12:47:59 2022 +0100

    ninja-fix: Fix bashisms on .circleci/generate.sh
    
    patch by Andrés de la Peña; reviewed by Brandon Williams for CASSANDRA-17939
---
 .circleci/generate.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.circleci/generate.sh b/.circleci/generate.sh
index fa109564e4..4ea520b786 100755
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@ -192,9 +192,9 @@ if (!($all)); then
     for test in $tests; do
       echo "  $test"
       has_env_vars=true
-      if grep -q "${1}=" <<< "$env_vars"; then
-        env_vars=$(sed -e "s/${1}=/${1}=${test},/" <<< $env_vars)
-      elif [[ $env_vars == "" ]]; then
+      if echo "$env_vars" | grep -q "${1}="; then
+        env_vars=$(echo "$env_vars" | sed -e "s/${1}=/${1}=${test},/")
+      elif [ -z "$env_vars" ]; then
         env_vars="${1}=${test}"
       else
         env_vars="$env_vars|${1}=${test}"
@@ -238,35 +238,35 @@ delete_job()
 }
 
 # removed unneeded repeated jobs
-if [[ $env_vars != *"REPEATED_UTESTS="* ]]; then
+if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS=" )); then
   delete_job "j8_unit_tests_repeat"
   delete_job "j11_unit_tests_repeat"
   delete_job "utests_compression_repeat"
   delete_job "utests_system_keyspace_directory_repeat"
 fi
-if [[ $env_vars != *"REPEATED_UTESTS_LONG="* ]]; then
+if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_LONG=")); then
   delete_job "utests_long_repeat"
 fi
-if [[ $env_vars != *"REPEATED_JVM_DTESTS="* ]]; then
+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 [[ $env_vars != *"REPEATED_JVM_UPGRADE_DTESTS="* ]]; then
+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 [[ $env_vars != *"REPEATED_DTESTS="* ]]; then
+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 [[ $env_vars != *"REPEATED_UPGRADE_DTESTS="* ]]; then
+if (! (echo "$env_vars" | grep -q "REPEATED_UPGRADE_DTESTS=")); then
   delete_job "j8_upgrade_dtests_repeat"
 fi
-if [[ $env_vars != *"REPEATED_ANT_TEST_CLASS="* ]]; then
+if (! (echo "$env_vars" | grep -q "REPEATED_ANT_TEST_CLASS=")); then
   delete_job "j8_repeated_ant_test"
   delete_job "j11_repeated_ant_test"
 fi


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org