enhancement: improve component readiness check when operator is being…

… installed
CFSNM · Nov 14, 2024 · 22f2beb · 22f2beb
1 parent 00e2391
commit 22f2beb
Showing 1 changed file with 36 additions and 19 deletions.
diff --git a/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot b/ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot
@@ -99,29 +99,27 @@ Verify RHODS Installation
   END
 
   ${dashboard} =    Is Component Enabled    dashboard    ${DSC_NAME}
-  IF    ("${UPDATE_CHANNEL}" == "stable" or "${UPDATE_CHANNEL}" == "beta") or "${dashboard}" == "true"
-    # Needs to be removed ASAP
+  IF    "${dashboard}" == "true"
+    Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
+    ...    label_selector=app=${DASHBOARD_APP_NAME}    timeout=1200s
     IF  "${PRODUCT}" == "ODH"
-        Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
-        ...    label_selector=app=odh-dashboard    timeout=1200s
         #This line of code is strictly used for the exploratory cluster to accommodate UI/UX team requests
         Add UI Admin Group To Dashboard Admin
-    ELSE
-        Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
-        ...    label_selector=app=${DASHBOARD_APP_NAME}    timeout=1200s
     END
   END
 
   ${workbenches} =    Is Component Enabled    workbenches    ${DSC_NAME}
-  IF    ("${UPDATE_CHANNEL}" == "stable" or "${UPDATE_CHANNEL}" == "beta") or "${workbenches}" == "true"
+  IF    "${workbenches}" == "true"
     Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
     ...    label_selector=app=notebook-controller    timeout=400s
     Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
     ...    label_selector=app=odh-notebook-controller    timeout=400s
+    Oc Get  kind=Namespace  field_selector=metadata.name=${NOTEBOOKS_NAMESPACE}
+    Log  Verified Notebooks NS: ${NOTEBOOKS_NAMESPACE}
   END
 
   ${modelmeshserving} =    Is Component Enabled    modelmeshserving    ${DSC_NAME}
-  IF    ("${UPDATE_CHANNEL}" == "stable" or "${UPDATE_CHANNEL}" == "beta") or "${modelmeshserving}" == "true"
+  IF    "${modelmeshserving}" == "true"
     Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
     ...    label_selector=app=odh-model-controller    timeout=400s
     Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
@@ -131,7 +129,7 @@ Verify RHODS Installation
   END
 
   ${datasciencepipelines} =    Is Component Enabled    datasciencepipelines    ${DSC_NAME}
-  IF    ("${UPDATE_CHANNEL}" == "stable" or "${UPDATE_CHANNEL}" == "beta") or "${datasciencepipelines}" == "true"
+  IF    "${datasciencepipelines}" == "true"
     Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
     ...    label_selector=app.kubernetes.io/name=data-science-pipelines-operator    timeout=400s
   END
@@ -144,6 +142,24 @@ Verify RHODS Installation
     ...    label_selector=control-plane=kserve-controller-manager    timeout=400s
   END
 
+  ${kueue} =     Is Component Enabled     kueue    ${DSC_NAME}
+  IF    "${kueue}" == "true"
+    Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
+    ...    label_selector=app.kubernetes.io/part-of=kueue   timeout=400s
+  END
+
+  ${codeflare} =     Is Component Enabled     codeflare    ${DSC_NAME}
+  IF    "${codeflare}" == "true"
+    Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
+    ...    label_selector=app.kubernetes.io/part-of=codeflare   timeout=400s
+  END
+
+  ${ray} =     Is Component Enabled     ray    ${DSC_NAME}
+  IF    "${ray}" == "true"
+    Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
+    ...    label_selector=app.kubernetes.io/part-of=ray   timeout=400s
+  END
+
   ${trustyai} =    Is Component Enabled    trustyai    ${DSC_NAME}
   IF    "${trustyai}" == "true"
     Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
@@ -156,10 +172,16 @@ Verify RHODS Installation
     ...    label_selector=app.kubernetes.io/part-of=model-registry-operator    timeout=400s
   END
 
-  IF    ("${UPDATE_CHANNEL}" == "stable" or "${UPDATE_CHANNEL}" == "beta") or "${dashboard}" == "true" or "${workbenches}" == "true" or "${modelmeshserving}" == "true" or "${datasciencepipelines}" == "true"  # robocop: disable
-    Log To Console    Waiting for pod status in ${APPLICATIONS_NAMESPACE}
-    Wait For Pods Status  namespace=${APPLICATIONS_NAMESPACE}  timeout=200
-    Log  Verified Applications NS: ${APPLICATIONS_NAMESPACE}  console=yes
+  ${trainingoperator} =    Is Component Enabled    trainingoperator    ${DSC_NAME}
+  IF    "${trainingoperator}" == "true"
+    Wait For Deployment Replica To Be Ready    namespace=${APPLICATIONS_NAMESPACE}
+    ...    label_selector=app.kubernetes.io/part-of=trainingoperator   timeout=400s
+  END
+
+  IF    "${dashboard}" == "true" or "${workbenches}" == "true" or "${modelmeshserving}" == "true" or "${datasciencepipelines}" == "true" or "${kserve}" == "true"  or "${kueue}" == "true"  or "${codeflare}" == "true" or "${ray}" == "true" or "${trustyai}" == "true" or "${modelregistry}" == "true" or "${trainingoperator}" == "true"    # robocop: disable
+      Log To Console    Waiting for pod status in ${APPLICATIONS_NAMESPACE}
+      Wait For Pods Status  namespace=${APPLICATIONS_NAMESPACE}  timeout=200
+      Log  Verified Applications NS: ${APPLICATIONS_NAMESPACE}  console=yes
   END
 
   # Monitoring stack only deployed for managed, as modelserving monitoring stack is no longer deployed
@@ -169,11 +191,6 @@ Verify RHODS Installation
      Log  Verified Monitoring NS: ${MONITORING_NAMESPACE}  console=yes
   END
 
-  IF    ("${UPDATE_CHANNEL}" == "stable" or "${UPDATE_CHANNEL}" == "beta") or "${workbenches}" == "true"
-    Oc Get  kind=Namespace  field_selector=metadata.name=${NOTEBOOKS_NAMESPACE}
-    Log  Verified Notebooks NS: ${NOTEBOOKS_NAMESPACE}
-  END
-
 Verify Builds In redhat-ods-applications
   Log  Verifying Builds  console=yes
   Wait Until Keyword Succeeds  45 min  15 s  Verify Builds Number  7