Enhance user deletion logic and add support for 'resolute' variant in user checks

Author: sireeshajonnalagadda

src/base-ubuntu/.devcontainer/Dockerfile

@@ -6,9 +6,9 @@ LABEL dev.containers.features="common"
 ARG VARIANT
 RUN if [ "$VARIANT" = "noble" ] || [ "$VARIANT" = "resolute" ]; then \
     if id "ubuntu" &>/dev/null; then \
-    echo "Deleting user 'ubuntu'  for $VARIANT" && userdel -f -r ubuntu || echo "Failed to delete ubuntu user for $VARIANT"; \  
+        echo "Deleting user 'ubuntu'  for $VARIANT" && userdel -f -r ubuntu || echo "Failed to delete ubuntu user for $VARIANT"; \
     else \
-    echo "User 'ubuntu' does not exist for $VARIANT"; \ 
+        echo "User 'ubuntu' does not exist for $VARIANT"; \
     fi; \
     fi
 

src/base-ubuntu/test-project/test.sh

@@ -32,8 +32,11 @@ check_ubuntu_user() {
 if grep -q 'VERSION_CODENAME=noble' /etc/os-release; then
     echo -e "\nThe base image is ubuntu:noble. Checking user Ubuntu.."
     check "uid" "check_ubuntu_user"
+elif grep -q 'VERSION_CODENAME=resolute' /etc/os-release; then
+    echo -e "\nThe base image is ubuntu:resolute. Checking user Ubuntu.."
+    check "uid" "check_ubuntu_user"
 else
-    echo -e "\nCannot check user Ubuntu. The base image is not ubuntu:noble."
+    echo -e "\nCannot check user Ubuntu. The base image is not ubuntu:noble or ubuntu:resolute."
 fi
 
 # Report result