From b685fee01896da018ebe867f089c31c048c8de98 Mon Sep 17 00:00:00 2001 From: stonepd Date: Wed, 18 Sep 2024 10:51:02 +0100 Subject: [PATCH 1/3] [patch] run grafana role after catalog install (#1250) --- tekton/src/pipelines/install.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tekton/src/pipelines/install.yml.j2 b/tekton/src/pipelines/install.yml.j2 index 83757d0db..ab04e64d6 100644 --- 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) }} From 1bd92c2e45bd5a5c86d61866d2aa9bc90212b207 Mon Sep 17 00:00:00 2001 From: Tremaine Hart Date: Wed, 18 Sep 2024 10:13:31 -0500 Subject: [PATCH 2/3] [patch] need to check for nfs-client now (#1252) --- .../internal/install_config_storage_classes | 12 ++++++++++++ python/src/mas/cli/install/app.py | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/image/cli/mascli/functions/internal/install_config_storage_classes b/image/cli/mascli/functions/internal/install_config_storage_classes index dd8ca79c3..e6fdee741 100644 --- 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 index 77fe5f72d..faf196202 100644 --- 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("Storage provider auto-detected: OpenShift Container Storage")) + print_formatted_text(HTML(" - Storage class (ReadWriteOnce): nfs-client")) + print_formatted_text(HTML(" - Storage class (ReadWriteMany): nfs-client")) + 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("Storage provider auto-detected: Azure Managed")) From 3afa904ec31fba6388c49edf756e4b746f559b18 Mon Sep 17 00:00:00 2001 From: leo-miran <105313348+leo-miran@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:56:41 -0300 Subject: [PATCH 3/3] [patch] mobile pytest task performance parameter (#1239) Co-authored-by: Gabriel Bonamico --- .../taskdefs/fvt-mobile/pytest/phase3-apps.yml.j2 | 4 +++- tekton/src/tasks/fvt/fvt-mobile-pytest.yml.j2 | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) 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 index cc69f89b2..34d16796c 100644 --- 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 index f3b92c694..76c2d8191 100644 --- 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