Fix cleanup dataproc cluster name pattern (#29154)

apache · Oct 26, 2023 · f4574bc · f4574bc
1 parent 32d1cc0
commit f4574bc
Showing 1 changed file with 2 additions and 5 deletions.
diff --git 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