updated timeout and check condition for CAII

Author: Avanish Tiwari

ClouderaSetup/OnCloud/AWS/build/CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.2.2] - 2025-08-13
+
+### Fixed
+- Increased the timeout and added a check for AI regsitry.
+
+## [3.2.1] - 2025-07-16
+
+### Added
+- Added new AWS region support for Keycloak server deployment.
+
+### Fixed
+- Logging enhancements and error handling for keycloak deployment.
+
+## [3.2.0]
+
+### Added
+- Added a new feature to provision and destroy CAII service
+
 ## [3.1.2] - 2025-04-16
 
 ### Fixed

ClouderaSetup/OnCloud/AWS/build/cdp-wrkshps-quickstarts/CAII/compute_cluster_deploy.sh

@@ -14,10 +14,13 @@ existing_cluster_status=$(cdp compute list-clusters | jq -r --arg name "$cluster
   | .status
 ')
 
-if [[ "$existing_cluster_status" == "RUNNING" ]]; then
+# Normalize status to lowercase for case-insensitive matching
+existing_status_lower=$(echo "$existing_cluster_status" | tr '[:upper:]' '[:lower:]')
+
+if [[ "$existing_status_lower" == "running" ]]; then
   echo "✅ Compute cluster '$cluster_name' is already RUNNING. Skipping creation."
 
-elif [[ "$existing_cluster_status" == "CREATING" ]]; then
+elif [[ "$existing_status_lower" == "creating" ]]; then
   echo "ℹ️ Compute cluster '$cluster_name' is already being created. Skipping creation."
 
 else
@@ -34,18 +37,23 @@ else
 
     echo "   ➤ Attempt $i: Status = $current_status"
 
-    if [[ "$current_status" == "RUNNING" ]]; then
+    # Convert to lowercase for comparison
+    current_status_lower=$(echo "$current_status" | tr '[:upper:]' '[:lower:]')
+
+    if [[ "$current_status_lower" == "running" ]]; then
       echo "✅ Compute cluster '$cluster_name' is now RUNNING."
       break
-    elif [[ "$current_status" == "FAILED" ]]; then
-      echo "❌ Compute cluster creation FAILED."
+    elif [[ "$current_status_lower" == *"failed"* ]]; then
+      echo "❌ Compute cluster creation FAILED with status: $current_status"
       exit 1
     fi
+
     sleep 30
   done
 
-  if [[ "$current_status" != "RUNNING" ]]; then
+  if [[ "$current_status_lower" != "running" ]]; then
     echo "❌ Timeout Error: Compute cluster did not reach RUNNING state."
     exit 1
   fi
 fi
+

ClouderaSetup/OnCloud/AWS/build/cdp-wrkshps-quickstarts/CAII/initialize_default_cluster.sh

@@ -29,17 +29,20 @@ for i in {1..60}; do
 
   echo "   ➤ Attempt $i: Status = $default_cluster_status"
 
-  if [[ "$default_cluster_status" == "RUNNING" ]]; then
+  # Convert to lowercase for case-insensitive matching
+  status_lower=$(echo "$default_cluster_status" | tr '[:upper:]' '[:lower:]')
+
+  if [[ "$status_lower" == "running" ]]; then
     echo "✅ Default compute cluster is now RUNNING."
     break
-  elif [[ "$default_cluster_status" == "FAILED" ]]; then
-    echo "❌ Default compute cluster initialization FAILED."
+  elif [[ "$status_lower" == *"failed"* ]]; then
+    echo "❌ Default compute cluster initialization FAILED with status: $default_cluster_status."
     exit 1
   fi
-  sleep 30
+  sleep 60
 done
 
-if [[ "$default_cluster_status" != "RUNNING" ]]; then
-  echo "❌ Timeout Error: Default cluster did not reach RUNNING state after 30 minutes."
+if [[ "$status_lower" != "running" ]]; then
+  echo "❌ Timeout Error: Default cluster did not reach RUNNING state after 60 minutes."
   exit 1
 fi

ClouderaSetup/OnCloud/AWS/build/entrypoint/hol-functions.sh

@@ -914,24 +914,56 @@ echo -e "\n               ==============================Provisioning Compute Clu
 }
 
 enable_model_registry() { 
-      echo -e "\n               =============================Deploying Model Registry ========================================="
-   USER_NAMESPACE=$workshop_name   
-   cd /userconfig/.$USER_NAMESPACE/CAII
-   environment_crn=$(cdp environments describe-environment --environment-name ${workshop_name}-cdp-env | jq -r .environment.crn)
-      # Check if ML Model Registry exists and is already installed
-   registry_status=$(cdp ml list-model-registries | jq -r --arg env_name "${workshop_name}-cdp-env" '
-     .modelRegistries[]
-     | select(.environmentName == $env_name)
-     | .status
-   ')
+  echo -e "\n               =============================Deploying Model Registry ========================================="
+  USER_NAMESPACE=$workshop_name   
+  cd /userconfig/.$USER_NAMESPACE/CAII
+
+  environment_crn=$(cdp environments describe-environment --environment-name ${workshop_name}-cdp-env | jq -r .environment.crn)
+
+  # Check if ML Model Registry exists and is already installed
+  registry_status=$(cdp ml list-model-registries | jq -r --arg env_name "${workshop_name}-cdp-env" '
+    .modelRegistries[]
+    | select(.environmentName == $env_name)
+    | .status
+  ')
+
+  if [[ "$registry_status" == "installation:finished" ]]; then
+    echo "✅ ML Model Registry for environment '${workshop_name}-cdp-env' is already installed. Skipping creation."
+    return
+  else
+    echo "🚀 Proceeding with model registry deployment"
+    cdp ml create-model-registry \
+      --environment-crn "$environment_crn" \
+      --environment-name "${workshop_name}-cdp-env" \
+      --use-public-load-balancer
+  fi
 
-   if [[ "$registry_status" == "installation:finished" ]]; then
-     echo "✅ ML Model Registry for environment '${workshop_name}-cdp-env' is already installed. Skipping creation."
-   else
-     echo "🚀 Proceeding with model registry deployment"
-     cdp ml create-model-registry --environment-crn $environment_crn --environment-name $workshop_name-cdp-env --use-public-load-balancer 
-   fi
+  echo "⏳ Waiting for ML Model Registry installation to finish..."
+  for i in {1..75}; do
+    registry_status=$(cdp ml list-model-registries | jq -r --arg env_name "${workshop_name}-cdp-env" '
+      .modelRegistries[]
+      | select(.environmentName == $env_name)
+      | .status
+    ')
+
+    echo "   ➤ Attempt $i: Status = $registry_status"
+
+    # Normalize to lowercase for matching
+    status_lower=$(echo "$registry_status" | tr '[:upper:]' '[:lower:]')
+
+    if [[ "$status_lower" == "installation:finished" ]]; then
+      echo "✅ ML Model Registry installation finished successfully."
+      return
+    elif [[ "$status_lower" == *"failed"* ]]; then
+      echo "❌ ML Model Registry installation FAILED with status: $registry_status"
+      exit 1
+    fi
+
+    sleep 60
+  done
 
+  echo "❌ Timeout Error: ML Model Registry did not reach 'installation:finished' state."
+  exit 1
 }
 
 provision_caii_service_app() {