Merge branch 'stable' into backuprestore-dev

Author: Sanjay Prabhakar

bin/mas-devops-notify-slack

@@ -81,14 +81,14 @@ def notifyProvisionRoks(channels: list[str], rc: int, additionalMsg: str = None)
         message = [
             SlackUtil.buildHeader(f":glyph-ok: Your IBM Cloud ROKS cluster ({name}) is ready"),
             SlackUtil.buildSection(f"{url}"),
-            SlackUtil.buildSection(f"<https://cloud.ibm.com/kubernetes/clusters|IBM Cloud Dashboard>{toolchainLink}")
+            SlackUtil.buildSection(f"<https://cloud.ibm.com/kubernetes/clusters|IBM Cloud Dashboard> | {toolchainLink}")
         ]
         if additionalMsg is not None:
             message.append(SlackUtil.buildSection(additionalMsg))
     else:
         message = [
             SlackUtil.buildHeader(f":glyph-fail: Your IBM Cloud ROKS cluster ({name}) failed to deploy"),
-            SlackUtil.buildSection(f"<https://cloud.ibm.com/kubernetes/clusters|IBM Cloud Dashboard>{toolchainLink}")
+            SlackUtil.buildSection(f"<https://cloud.ibm.com/kubernetes/clusters|IBM Cloud Dashboard> | {toolchainLink}")
         ]
 
     response = SlackUtil.postMessageBlocks(channels, message)

src/mas/devops/ocp.py

@@ -317,8 +317,12 @@ def listInstances(dynClient: DynamicClient, apiVersion: str, kind: str) -> list:
 
 
 def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool:
+    """
+    We will allow up to 10 minutes for a PVC to report a successful binding
+    """
     pvcAPI = dynClient.resources.get(api_version="v1", kind="PersistentVolumeClaim")
-    maxRetries = 60
+    maxRetries = 20
+    retryDelaySeconds = 30
     foundReadyPVC = False
     retries = 0
     while not foundReadyPVC and retries < maxRetries:
@@ -328,11 +332,11 @@ def waitForPVC(dynClient: DynamicClient, namespace: str, pvcName: str) -> bool:
             if pvc.status.phase == "Bound":
                 foundReadyPVC = True
             else:
-                logger.debug(f"Waiting 5s for PVC {pvcName} to be ready before checking again ...")
-                sleep(5)
+                logger.debug(f"Waiting {retryDelaySeconds}s for PVC {pvcName} to be bound before checking again ...")
+                sleep(retryDelaySeconds)
         except NotFoundError:
-            logger.debug(f"Waiting 5s for PVC {pvcName} to be created before checking again ...")
-            sleep(5)
+            logger.debug(f"Waiting {retryDelaySeconds}s for PVC {pvcName} to be created before checking again ...")
+            sleep(retryDelaySeconds)
 
     return foundReadyPVC
 

src/mas/devops/templates/pipelinerun-install.yml.j2

@@ -275,8 +275,10 @@ spec:
 
     # Dependencies - SLS
     # -------------------------------------------------------------------------
+{%- if sls_channel is defined and sls_channel != "" %}
     - name: sls_channel
-      value: '3.x'
+      value: "{{ sls_channel }}"
+{%- endif %}
 {%- if sls_entitlement_file is defined and sls_entitlement_file != "" %}
     - name: sls_entitlement_file
       value: "{{ sls_entitlement_file }}"