[beam] branch master updated: Fix cleanup dataproc cluster name pattern (#29154)

[yhu]

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

yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new f4574bc9721 Fix cleanup dataproc cluster name pattern (#29154)
f4574bc9721 is described below

commit f4574bc9721e82192e81bdb1f5e97c4b83d20fbc
Author: Yi Hu <ya...@google.com>
AuthorDate: Thu Oct 26 17:22:48 2023 -0400

    Fix cleanup dataproc cluster name pattern (#29154)
---
 .test-infra/dataproc/cleanup.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.test-infra/dataproc/cleanup.sh b/.test-infra/dataproc/cleanup.sh
index e535fabb777..3efb80d8613 100755
--- a/.test-infra/dataproc/cleanup.sh
+++ b/.test-infra/dataproc/cleanup.sh
@@ -20,10 +20,7 @@ clustersList=( )
 toDeleteList=( )
 
 
-generatedResources=("beam-loadtests-go-cogbk-flink" 
"beam-loadtests-python-cogbk-flink" \
-"beam-loadtests-go-combine-flink" "beam-loadtests-python-combine-flink" \
-"beam-loadtests-go-gbk-flink" "beam-loadtests-python-gbk-flink" \
-"beam-loadtests-go-pardo-flink" "beam-loadtests-python-pardo-flink" \
+generatedResources=("beam-loadtests-go-*-flink" 
"beam-loadtests-python-*-flink" \
 "beam-postcommit-python-chicago" )
 
 function deleteFilteredClusters(){
@@ -51,7 +48,7 @@ function filterClusters(){
                if [[ $elapsedHours -ge 2 ]]; then 
                        for name in ${generatedResources[@]}; do
                                # Only resources generated by the groovy jobs 
set are queued for deletion
-                               if [[ "$cluster" == *"$name"* ]]; then
+                               if [[ "$cluster" == *${name}* ]]; then
                                        toDeleteList+=( "$cluster" )
                                        break
                                fi