fix nightly cleanup for duplicate server names

Author: bertiethorpe

.github/workflows/nightly-cleanup.yml

@@ -67,31 +67,33 @@ jobs:
           for cluster_prefix in ${ci_clusters}
           do
             echo "Processing cluster: $cluster_prefix"
+
             # Get all servers with the matching name for control node
-            CONTROL_SERVERS=$(openstack server list --name ${cluster_prefix}-control --format json)
-            SERVER_COUNT=$(echo "$CONTROL_SERVERS" | jq length)
+            CONTROL_SERVERS=$(openstack server list --name ${cluster_prefix}-control --long --format json)
+
+            # Get unique server names to avoid duplicate cleanup
+            UNIQUE_NAMES=$(echo "$CONTROL_SERVERS" | jq -r '.[].Name' | sort | uniq)
+            for name in $UNIQUE_NAMES; do
+              echo "Checking control node: $name"
+
+              # Get the first matching server ID by name
+              server=$(echo "$CONTROL_SERVERS" | jq -r '.[] | select(.Name=="'"$name"'") | .ID' | head -n1)
+
+              # Make sure server still exists (wasn't deleted earlier)
+              if ! openstack server show "$server" &>/dev/null; then
+                echo "Server $server no longer exists, skipping $name."
+                continue
+              fi
+
+              # Get tags for the server
+              TAGS=$(openstack server show "$server" --column tags --format value)
 
-            if [[ $SERVER_COUNT -gt 1 ]]; then
-              echo "Multiple servers found for control node '${cluster_prefix}-control'. Checking tags for each..."
-              
-              for server in $(echo "$CONTROL_SERVERS" | jq -r '.[].ID'); do
-                # Get tags for each control node
-                TAGS=$(openstack server show "$server" --column tags --format value)
-                
-                if [[ $TAGS =~ "keep" ]]; then
-                  echo "Skipping ${cluster_prefix} (server ${server}) - control instance is tagged as keep"
-                else
-                  ./dev/delete-cluster.py ${cluster_prefix} --force
-                fi
-              done
-            else
-              # If only one server, extract its tags and proceed
-              TAGS=$(echo "$CONTROL_SERVERS" | jq -r '.[0].Tags')
               if [[ $TAGS =~ "keep" ]]; then
-                echo "Skipping ${cluster_prefix} - control instance is tagged as keep"
+                echo "Skipping $cluster_prefix - control instance is tagged as keep"
               else
-                ./dev/delete-cluster.py ${cluster_prefix} --force
+                echo "Deleting cluster $cluster_prefix (server $server)..."
+                ./dev/delete-cluster.py $cluster_prefix --force
               fi
-            fi
+            done
           done
         shell: bash