mas-cli 11.1.2__py3-none-any.whl → 11.2.0__py3-none-any.whl

mas/cli/templates/ibm-mas-tekton.yaml

@@ -108,7 +108,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -226,7 +226,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -296,7 +296,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -362,7 +362,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -483,7 +483,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -603,7 +603,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -720,7 +720,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -826,7 +826,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1148,7 +1148,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1258,7 +1258,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -1347,7 +1347,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1451,7 +1451,7 @@ spec:
         - -c
       name: gitops-bootstrap
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1528,7 +1528,7 @@ spec:
         - -c
       name: gitops-cis-compliance
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1599,6 +1599,10 @@ spec:
       type: string
       default: ''
 
+    - name: devops_build_number
+      type: string
+      default: ''
+
     - name: dns_provider
       type: string
       default: cis
@@ -1658,6 +1662,9 @@ spec:
         value: $(params.cluster_promotion_target_pr_title)
       - name: CLUSTER_PROMOTION_CLUSTER_VALUES
         value: $(params.cluster_promotion_cluster_values)
+      
+      - name: DEVOPS_BUILD_NUMBER
+        value: $(params.devops_build_number)
 
       - name: DNS_PROVIDER
         value: $(params.dns_provider)
@@ -1712,7 +1719,7 @@ spec:
         - -c
       name: gitops-cluster
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1807,7 +1814,7 @@ spec:
         - -c
       name: gitops-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1920,7 +1927,7 @@ spec:
         - -c
       name: gitops-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2029,7 +2036,7 @@ spec:
         - -c
       name: gitops-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2281,7 +2288,7 @@ spec:
         - -c
       name: gitops-db2u-database
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2374,7 +2381,7 @@ spec:
         - -c
       name: gitops-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2501,7 +2508,7 @@ spec:
         - -c
       name: gitops-delete-jdbc-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2599,7 +2606,7 @@ spec:
         - -c
       name: gitops-delete-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -2691,7 +2698,7 @@ spec:
         - -c
       name: gitops-deprovision-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2776,7 +2783,7 @@ spec:
         - -c
       name: gitops-deprovision-app-install
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2861,7 +2868,7 @@ spec:
         - -c
       name: gitops-deprovision-cluster
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2972,7 +2979,7 @@ spec:
         - -c
       name: gitops-deprovision-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3060,7 +3067,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u-database
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -3143,7 +3150,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -3219,7 +3226,7 @@ spec:
         - -c
       name: gitops-deprovision-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -3328,7 +3335,7 @@ spec:
         - -c
       name: gitops-deprovision-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3430,7 +3437,7 @@ spec:
         - -c
       name: gitops-deprovision-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -3487,7 +3494,7 @@ spec:
         - -c
       name: gitops-deprovision-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3692,7 +3699,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -3790,7 +3797,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3882,7 +3889,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3974,7 +3981,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4067,7 +4074,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4158,7 +4165,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-workspace
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4251,7 +4258,7 @@ spec:
         - -c
       name: gitops-deprovision-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -4354,7 +4361,7 @@ spec:
         - -c
       name: gitops-dro
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4436,7 +4443,7 @@ spec:
         - -c
       name: gitops-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -4571,7 +4578,7 @@ spec:
         - -c
       name: gitops-jdbc-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -4667,7 +4674,7 @@ spec:
         - -c
       name: gitops-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -4788,7 +4795,7 @@ spec:
         - -c
       name: gitops-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4839,7 +4846,7 @@ spec:
         - -c
       name: gitops-license
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: shared-entitlement
 
@@ -4917,6 +4924,8 @@ spec:
 
     - name: artifactory_generic_release_url
       type: string
+    - name: artifactory_generic_logs_url
+      type: string
     - name: fvt_ansible_version
       type: string
 
@@ -5044,6 +5053,8 @@ spec:
         value: $(params.fvt_image_registry)
       - name: ARTIFACTORY_GENERIC_RELEASE_URL
         value: $(params.artifactory_generic_release_url)
+      - name: ARTIFACTORY_GENERIC_LOGS_URL
+        value: $(params.artifactory_generic_logs_url)
       - name: FVT_ANSIBLE_VERSION
         value: $(params.fvt_ansible_version)
       - name: MAS_WORKSPACE_ID
@@ -5140,6 +5151,12 @@ spec:
     - args:
       - |-
 
+        set -o pipefail
+        trap '[[ $? -eq 1 ]] && mas must-gather --directory /workspace/mustgather --extra-namespaces selenium' ERR EXIT
+
+        export ARTIFACTORY_TOKEN=${FVT_ARTIFACTORY_TOKEN}
+        export ARTIFACTORY_UPLOAD_DIR=${ARTIFACTORY_GENERIC_LOGS_URL}/mas-fvt/${MAS_INSTANCE_ID}/${DEVOPS_BUILD_NUMBER}
+
         CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" 
         . $CLI_DIR/functions/gitops_utils
 
@@ -5208,55 +5225,84 @@ spec:
           SUITE_APP_NAME="suite.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
           WORKSPACE_APP="${MAS_WORKSPACE_ID}.suite.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
 
-          check_argo_app_healthy "${MONGO_CONFIG_APP}" 
-          check_argo_app_healthy "${SLS_CONFIG_APP}"
-          check_argo_app_healthy "${BAS_CONFIG_APP}"
-          check_argo_app_healthy "${SLS_APP_NAME}"
-          check_argo_app_healthy "${SUITE_APP_NAME}"
-          check_argo_app_healthy "${WORKSPACE_APP}"
+          check_argo_app_healthy "${SLS_APP_NAME}" 180 #90 minutes
+          check_argo_app_healthy "${MONGO_CONFIG_APP}" 30 #15 minutes
+          check_argo_app_healthy "${SLS_CONFIG_APP}" 30
+          check_argo_app_healthy "${BAS_CONFIG_APP}" 30
+          check_argo_app_healthy "${SUITE_APP_NAME}" 30
+          check_argo_app_healthy "${WORKSPACE_APP}" 30
         fi
       
         if [[ "$LAUNCHER_ID" == "apps" ]]; then
+          # The following order is defined by the sync wave order in https://github.com/ibm-mas/gitops/tree/main/root-applications/ibm-mas-instance-root/templates
+          # First wave (has to include the prereqs cp4d, db2)
+          if [[ "$LAUNCHFVT_MANAGE" == "true" ]]; then
+            MASAPP_APP="manage.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
+            check_argo_app_healthy "${MASAPP_APP}" 240
+          fi
+          if [[ "$LAUNCHFVT_MOBILE" == "true" ]]; then
+            MASAPP_APP="manage.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
+            check_argo_app_healthy "${MASAPP_APP}" 240
+          fi
+          # Second wave
           if [[ "$LAUNCHFVT_ASSIST" == "true" ]]; then
             MASAPP_APP="assist.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
-            check_argo_app_healthy "${MASAPP_APP}"
-            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}"
+            check_argo_app_healthy "${MASAPP_APP}" 120
+          fi
+          if [[ "$LAUNCHFVT_VISUALINSPECTION" == "true" ]]; then
+            MASAPP_APP="visualinspection.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
+            check_argo_app_healthy "${MASAPP_APP}" 120
           fi
           if [[ "$LAUNCHFVT_IOT" == "true" ]]; then
             MASAPP_APP="iot.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
-            check_argo_app_healthy "${MASAPP_APP}"
-            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}"
+            check_argo_app_healthy "${MASAPP_APP}" 240
           fi
           if [[ "$LAUNCHFVT_MANAGE" == "true" ]]; then
             MASAPP_APP="manage.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
-            check_argo_app_healthy "${MASAPP_APP}"
-            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}"
+            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}" 840
           fi
           if [[ "$LAUNCHFVT_MOBILE" == "true" ]]; then
             MASAPP_APP="manage.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
-            check_argo_app_healthy "${MASAPP_APP}"
-            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}"
+            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}" 840
           fi
+          # Third wave
+          if [[ "$LAUNCHFVT_ASSIST" == "true" ]]; then
+            MASAPP_APP="assist.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
+            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}" 120
+          fi
+          if [[ "$LAUNCHFVT_VISUALINSPECTION" == "true" ]]; then
+            MASAPP_APP="visualinspection.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
+            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}" 120
+          fi
+          if [[ "$LAUNCHFVT_IOT" == "true" ]]; then
+            MASAPP_APP="iot.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
+            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}" 20
+          fi
+          # Fourth wave
+          if [[ "$LAUNCHFVT_MONITOR" == "true" ]]; then
+            MASAPP_APP="monitor.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
+            check_argo_app_healthy "${MASAPP_APP}" 80
+          fi
+          if [[ "$LAUNCHFVT_OPTIMIZER" == "true" ]]; then
+            MASAPP_APP="optimizer.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
+            check_argo_app_healthy "${MASAPP_APP}" 60
+          fi
+          # Fifth wave
           if [[ "$LAUNCHFVT_MONITOR" == "true" ]]; then
             MASAPP_APP="monitor.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
-            check_argo_app_healthy "${MASAPP_APP}"
-            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}"
+            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}" 180
           fi
           if [[ "$LAUNCHFVT_OPTIMIZER" == "true" ]]; then
             MASAPP_APP="optimizer.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
-            check_argo_app_healthy "${MASAPP_APP}"
-            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}"
+            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}" 60
           fi
+          # Sixth wave
           if [[ "$LAUNCHFVT_PREDICT" == "true" ]]; then
             MASAPP_APP="predict.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
-            check_argo_app_healthy "${MASAPP_APP}"
-            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}"
-          fi
-          if [[ "$LAUNCHFVT_VISUALINSPECTION" == "true" ]]; then
-            MASAPP_APP="visualinspection.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
-            check_argo_app_healthy "${MASAPP_APP}"
-            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}"
+            check_argo_app_healthy "${MASAPP_APP}" 120
+            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}" 120
           fi
+
         fi
 
         echo "argo:argocd proj windows add mas --kind deny --schedule * * * * * --duration 4h --applications *"  
@@ -5296,7 +5342,7 @@ spec:
         - -c
       name: gitops-mas-fvt-preparer
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -5700,7 +5746,7 @@ spec:
         - -c
       name: gitops-mas-initiator
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5807,7 +5853,7 @@ spec:
         - -c
       name: gitops-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -5919,7 +5965,7 @@ spec:
         - -c
       name: gitops-nvidia-gpu
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6036,7 +6082,7 @@ spec:
         - -c
       name: gitops-process-mongo-user
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6092,7 +6138,7 @@ spec:
         - -c
       name: gitops-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6274,7 +6320,7 @@ spec:
         - -c
       name: gitops-suite-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -6427,7 +6473,7 @@ spec:
         - -c
       name: gitops-suite-app-install
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -6533,7 +6579,7 @@ spec:
         - -c
       name: gitops-suite-certs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: certificates
@@ -6693,7 +6739,7 @@ spec:
         - -c
       name: gitops-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -6793,7 +6839,7 @@ spec:
         - -c
       name: gitops-suite-dns
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -6917,7 +6963,7 @@ spec:
         - -c
       name: gitops-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -7018,7 +7064,7 @@ spec:
         - -c
       name: gitops-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7162,7 +7208,7 @@ spec:
         - -c
       name: gitops-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 
@@ -7271,7 +7317,7 @@ spec:
         - -c
       name: gitops-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7368,7 +7414,7 @@ spec:
         - -c
       name: gitops-suite-workspace
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7638,7 +7684,7 @@ spec:
         - -c
       name: gitops-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7688,7 +7734,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -7822,7 +7868,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -8064,7 +8110,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -8247,7 +8293,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -8290,7 +8336,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -8407,7 +8453,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -8443,7 +8489,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8485,7 +8531,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8527,7 +8573,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8569,7 +8615,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8611,7 +8657,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8737,7 +8783,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -8805,7 +8851,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -8986,7 +9032,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9361,12 +9407,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -9567,7 +9613,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -9656,7 +9702,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -9719,7 +9765,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -9794,7 +9840,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -9895,7 +9941,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -10038,7 +10084,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -10105,7 +10151,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10176,7 +10222,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -10366,7 +10412,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -10615,7 +10661,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10703,7 +10749,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -10768,7 +10814,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -10838,7 +10884,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -10900,12 +10946,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-suite-verify exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
     - name: suite-post-verify
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -11034,7 +11080,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -11115,7 +11161,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -11178,7 +11224,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -11264,7 +11310,7 @@ spec:
 
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -11326,7 +11372,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -11390,7 +11436,7 @@ spec:
 
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:11.1.2
+      image: quay.io/ibmmas/cli:11.2.0
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:
@@ -11820,9 +11866,41 @@ spec:
           value: 120  # attempts before giving up
         - name: ignore_failure
           value: $(params.ignore_failure)  # fails and exit once the first failure is detected
-    - name: gitops-deprovision-mongo
+
+    # Deprovision EFS
+    # -------------------------------------------------------------------------
+    - name: gitops-deprovision-efs
       runAfter:
         - wait-for-deprovision
+      params:
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: cloud_provider
+          value: $(params.cloud_provider)
+        - name: avp_aws_secret_key
+          value: $(params.avp_aws_secret_key)
+        - name: avp_aws_access_key
+          value: $(params.avp_aws_access_key)
+        - name: efs_action
+          value: $(params.efs_action)
+      workspaces:
+        - name: configs
+          workspace: configs
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-efs
+
+    # Deprovision Mongo
+    # -------------------------------------------------------------------------
+    - name: gitops-deprovision-mongo
+      runAfter:
+        - gitops-deprovision-efs
       params:
         - name: cluster_name
           value: $(params.cluster_name)
@@ -11848,9 +11926,12 @@ spec:
       workspaces:
         - name: configs
           workspace: configs
+
+    # Deprovision Kafka
+    # -------------------------------------------------------------------------
     - name: gitops-deprovision-kafka
       runAfter:
-        - wait-for-deprovision
+        - gitops-deprovision-efs
       params:
         - name: cluster_name
           value: $(params.cluster_name)
@@ -11879,11 +11960,11 @@ spec:
         - name: configs
           workspace: configs
 
-    # 11. Deprovision COS
+    # Deprovision COS
     # -------------------------------------------------------------------------
     - name: gitops-deprovision-cos
       runAfter:
-        - wait-for-deprovision
+        - gitops-deprovision-efs
       params:
         - name: secrets_path
           value: $(params.secrets_path)
@@ -11903,20 +11984,16 @@ spec:
 
         - name: github_pat
           value: $(params.github_pat)
-
         - name: cluster_name
           value: $(params.cluster_name)
         - name: account
           value: $(params.account)
-
         - name: avp_aws_secret_key
           value: $(params.avp_aws_secret_key)
         - name: avp_aws_access_key
           value: $(params.avp_aws_access_key)
-
         - name: mas_instance_id
           value: $(params.mas_instance_id)
-
         - name: cos_action
           value: $(params.cos_action)
         - name: cos_type
@@ -11927,43 +12004,12 @@ spec:
           value: $(params.ibmcloud_apikey)
         - name: cos_use_hmac
           value: $(params.cos_use_hmac)
-
       workspaces:
         - name: configs
           workspace: configs
       taskRef:
         kind: Task
         name: gitops-deprovision-cos
-
-    # Uninstall AWS Elastic File Service (EFS)
-    - name: gitops-deprovision-efs
-      runAfter:
-        - wait-for-deprovision
-      params:
-        - name: secrets_path
-          value: $(params.secrets_path)
-        - name: avp_aws_secret_region
-          value: $(params.avp_aws_secret_region)
-        - name: cluster_name
-          value: $(params.cluster_name)
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: cloud_provider
-          value: $(params.cloud_provider)
-        - name: avp_aws_secret_key
-          value: $(params.avp_aws_secret_key)
-        - name: avp_aws_access_key
-          value: $(params.avp_aws_access_key)
-        - name: efs_action
-          value: $(params.efs_action)
-
-      workspaces:
-        - name: configs
-          workspace: configs
-
-      taskRef:
-        kind: Task
-        name: gitops-deprovision-efs
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/pipelines/deprovision-mas-deps.yaml
 # --------------------------------------------------------------------------------
@@ -12075,7 +12121,39 @@ spec:
       default: ""
 
   tasks:
+
+    # Deprovision EFS
+    # -------------------------------------------------------------------------
+    - name: gitops-deprovision-efs
+      params:
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: cloud_provider
+          value: $(params.cloud_provider)
+        - name: avp_aws_secret_key
+          value: $(params.avp_aws_secret_key)
+        - name: avp_aws_access_key
+          value: $(params.avp_aws_access_key)
+        - name: efs_action
+          value: $(params.efs_action)
+      workspaces:
+        - name: configs
+          workspace: configs
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-efs
+
+    # Deprovision Mongo
+    # -------------------------------------------------------------------------
     - name: gitops-deprovision-mongo
+      runAfter:
+        - gitops-deprovision-efs
       params:
         - name: cluster_name
           value: $(params.cluster_name)
@@ -12101,7 +12179,12 @@ spec:
       workspaces:
         - name: configs
           workspace: configs
+
+    # Deprovision Kafka
+    # -------------------------------------------------------------------------
     - name: gitops-deprovision-kafka
+      runAfter:
+        - gitops-deprovision-efs
       params:
         - name: cluster_name
           value: $(params.cluster_name)
@@ -12130,9 +12213,11 @@ spec:
         - name: configs
           workspace: configs
 
-    # 11. Deprovision COS
+    # Deprovision COS
     # -------------------------------------------------------------------------
     - name: gitops-deprovision-cos
+      runAfter:
+        - gitops-deprovision-efs
       params:
         - name: secrets_path
           value: $(params.secrets_path)
@@ -12152,20 +12237,16 @@ spec:
 
         - name: github_pat
           value: $(params.github_pat)
-
         - name: cluster_name
           value: $(params.cluster_name)
         - name: account
           value: $(params.account)
-
         - name: avp_aws_secret_key
           value: $(params.avp_aws_secret_key)
         - name: avp_aws_access_key
           value: $(params.avp_aws_access_key)
-
         - name: mas_instance_id
           value: $(params.mas_instance_id)
-
         - name: cos_action
           value: $(params.cos_action)
         - name: cos_type
@@ -12176,41 +12257,12 @@ spec:
           value: $(params.ibmcloud_apikey)
         - name: cos_use_hmac
           value: $(params.cos_use_hmac)
-
       workspaces:
         - name: configs
           workspace: configs
       taskRef:
         kind: Task
         name: gitops-deprovision-cos
-
-    # Uninstall AWS Elastic File Service (EFS)
-    - name: gitops-deprovision-efs
-      params:
-        - name: secrets_path
-          value: $(params.secrets_path)
-        - name: avp_aws_secret_region
-          value: $(params.avp_aws_secret_region)
-        - name: cluster_name
-          value: $(params.cluster_name)
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: cloud_provider
-          value: $(params.cloud_provider)
-        - name: avp_aws_secret_key
-          value: $(params.avp_aws_secret_key)
-        - name: avp_aws_access_key
-          value: $(params.avp_aws_access_key)
-        - name: efs_action
-          value: $(params.efs_action)
-
-      workspaces:
-        - name: configs
-          workspace: configs
-
-      taskRef:
-        kind: Task
-        name: gitops-deprovision-efs
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/pipelines/deprovision-mas-instance.yaml
 # --------------------------------------------------------------------------------
@@ -16210,6 +16262,9 @@ spec:
     - name: cluster_promotion_cluster_values
       type: string
       default: ''
+    - name: devops_build_number
+      type: string
+      default: ''
     - name: dns_provider
       type: string
       default: cis
@@ -16272,6 +16327,9 @@ spec:
         - name: cluster_promotion_cluster_values
           value: $(params.cluster_promotion_cluster_values)
 
+        - name: devops_build_number
+          value: $(params.devops_build_number)
+
         - name: ocp_cluster_domain
           value: $(params.ocp_cluster_domain)
         - name: dns_provider
@@ -16720,6 +16778,8 @@ spec:
       type: string
     - name: artifactory_generic_release_url
       type: string
+    - name: artifactory_generic_logs_url
+      type: string
     - name: fvt_ansible_version
       type: string
 
@@ -16870,6 +16930,8 @@ spec:
 
         - name: artifactory_generic_release_url
           value: $(params.artifactory_generic_release_url)
+        - name: artifactory_generic_logs_url
+          value: $(params.artifactory_generic_logs_url)
         - name: fvt_ansible_version
           value: $(params.fvt_ansible_version)
 
@@ -18904,7 +18966,7 @@ spec:
       when:
         - input: "$(params.skip_pre_check)"
           operator: notin
-          values: ["true"]
+          values: ["True"]
 
 
     # 1. Setup Cluster-wide Dependencies & Configure Cluster Monitoring
@@ -21109,7 +21171,7 @@ spec:
       when:
         - input: "$(params.skip_pre_check)"
           operator: notin
-          values: ["true"]
+          values: ["True"]
 
       runAfter:
         - app-cfg-assist
@@ -21527,7 +21589,7 @@ spec:
       when:
         - input: "$(params.skip_pre_check)"
           operator: notin
-          values: ["true"]
+          values: ["True"]
 
 
     # 2. Rollback suite
@@ -21602,7 +21664,7 @@ spec:
       when:
         - input: "$(params.skip_pre_check)"
           operator: notin
-          values: ["true"]
+          values: ["True"]
 
       runAfter:
         - manage-rollback
@@ -22242,7 +22304,7 @@ spec:
       when:
         - input: "$(params.skip_pre_check)"
           operator: notin
-          values: ["true"]
+          values: ["True"]
 
 
 
@@ -22288,7 +22350,7 @@ spec:
       when:
         - input: "$(params.skip_pre_check)"
           operator: notin
-          values: ["true"]
+          values: ["True"]
 
       runAfter:
         - update-catalog
@@ -22691,7 +22753,7 @@ spec:
       when:
         - input: "$(params.skip_pre_check)"
           operator: notin
-          values: ["true"]
+          values: ["True"]
 
       runAfter:
         - update-db2
@@ -22818,7 +22880,7 @@ spec:
       when:
         - input: "$(params.skip_pre_check)"
           operator: notin
-          values: ["true"]
+          values: ["True"]
 
 
 
@@ -23032,7 +23094,7 @@ spec:
       when:
         - input: "$(params.skip_pre_check)"
           operator: notin
-          values: ["true"]
+          values: ["True"]
 
       runAfter:
         # Phase 2 apps that don't have a phase 3 app following it