Merge branch 'master' into octobercatalog

ibm-mas · Sep 19, 2024 · 6d7bed4 · 6d7bed4
2 parents 2768461 + 3afa904
commit 6d7bed4
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/image/cli/mascli/functions/internal/install_config_storage_classes b/image/cli/mascli/functions/internal/install_config_storage_classes
@@ -65,6 +65,18 @@ function install_config_storage_classes() {
     fi
   fi
 
+  if [[ "$STORAGE_CLASS_RWX" == "" ]]; then
+    oc get storageclass nfs-client &>> $LOGFILE
+    if [[ $? == "0" ]]; then
+      echo -e "${COLOR_GREEN}Storage provider auto-detected: OpenShift Container Storage${TEXT_RESET}"
+      echo "${TEXT_DIM}  - Storage class (ReadWriteOnce): nfs-client"
+      echo "${TEXT_DIM}  - Storage class (ReadWriteMany): nfs-client"
+      STORAGE_CLASS_PROVIDER=ocs
+      STORAGE_CLASS_RWO=nfs-client
+      STORAGE_CLASS_RWX=nfs-client
+    fi
+  fi
+
   # 3. Azure
   if [[ "$STORAGE_CLASS_RWX" == "" ]]; then
     oc get storageclass managed-premium &>> $LOGFILE

diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py
@@ -484,6 +484,14 @@ def configStorageClasses(self):
             self.storageClassProvider = "ocs"
             self.params["storage_class_rwo"] = "ocs-storagecluster-ceph-rbd"
             self.params["storage_class_rwx"] = "ocs-storagecluster-cephfs"
+        # OCS quick burn uses nfs-client now
+        elif getStorageClass(self.dynamicClient, "nfs-client") is not None:
+            print_formatted_text(HTML("<MediumSeaGreen>Storage provider auto-detected: OpenShift Container Storage</MediumSeaGreen>"))
+            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteOnce): nfs-client</LightSlateGrey>"))
+            print_formatted_text(HTML("<LightSlateGrey>  - Storage class (ReadWriteMany): nfs-client</LightSlateGrey>"))
+            self.storageClassProvider = "ocs"
+            self.params["storage_class_rwo"] = "nfs-client"
+            self.params["storage_class_rwx"] = "nfs-client"
         # 3. Azure
         elif getStorageClass(self.dynamicClient, "managed-premium") is not None:
             print_formatted_text(HTML("<MediumSeaGreen>Storage provider auto-detected: Azure Managed</MediumSeaGreen>"))

diff --git a/tekton/src/pipelines/install.yml.j2 b/tekton/src/pipelines/install.yml.j2
@@ -63,7 +63,7 @@ spec:
           operator: in
           values: ["install"]
       runAfter:
-        - pre-install-check
+        - ibm-catalogs
 
     # 1.4 Configure ECK
     {{ lookup('template', pipeline_src_dir ~ '/taskdefs/cluster-setup/eck.yml.j2') | indent(4) }}

diff --git a/tekton/src/pipelines/taskdefs/fvt-mobile/pytest/phase3-apps.yml.j2 b/tekton/src/pipelines/taskdefs/fvt-mobile/pytest/phase3-apps.yml.j2
@@ -3,7 +3,9 @@
   params:
     {{ lookup('template', 'taskdefs/fvt-mobile/common/params-pytest.yml.j2') | indent(4) }}
     - name: fvt_test_suite
-      value: mobile-api-sr    
+      value: mobile-api-sr  
+    - name: enable_perf_debug
+      value: "True"
   runAfter:
     - fvt-mobile-pytest-setup
 

diff --git a/tekton/src/tasks/fvt/fvt-mobile-pytest.yml.j2 b/tekton/src/tasks/fvt/fvt-mobile-pytest.yml.j2
@@ -51,6 +51,10 @@ spec:
 
     # Test-specific Information (all optional)
     # -------------------------------------------------------------------------
+    - name: enable_perf_debug
+      type: string
+      description: Used to determine if response time will be displayed and saved or not
+      default: "False"
     - name: upload_file
       type: string
       description: Used only by fvt-mobile-version step to upload version file to artifactory
@@ -110,7 +114,9 @@ spec:
 
       - name: UPLOAD_FILE
         value: "$(params.upload_file)"
-
+      - name: ENABLE_PERF_DEBUG
+        value: "$(params.enable_perf_debug)"
+
       - name: WORKSPACE_MANAGEDATA_PATH
         value: "$(params.workspace_managedata_path)"
       - name: INPUT_DATA_FILE