mas-cli 13.20.0__py3-none-any.whl → 13.22.0__py3-none-any.whl

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

@@ -231,7 +231,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aibroker
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/appconnect.yaml
@@ -342,7 +342,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -460,7 +460,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -530,7 +530,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -596,7 +596,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -723,7 +723,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -843,7 +843,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -960,7 +960,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1066,7 +1066,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1388,7 +1388,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1498,7 +1498,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -1587,7 +1587,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1691,7 +1691,7 @@ spec:
         - -c
       name: gitops-bootstrap
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1773,7 +1773,7 @@ spec:
         - -c
       name: gitops-cis-compliance
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2078,7 +2078,7 @@ spec:
         - -c
       name: gitops-cluster
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2186,7 +2186,7 @@ spec:
         - -c
       name: gitops-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2334,7 +2334,7 @@ spec:
         - -c
       name: gitops-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2463,7 +2463,7 @@ spec:
         - -c
       name: gitops-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2754,7 +2754,7 @@ spec:
         - -c
       name: gitops-db2u-database
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2852,7 +2852,7 @@ spec:
         - -c
       name: gitops-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2979,7 +2979,7 @@ spec:
         - -c
       name: gitops-delete-jdbc-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3077,7 +3077,7 @@ spec:
         - -c
       name: gitops-delete-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -3169,7 +3169,7 @@ spec:
         - -c
       name: gitops-deprovision-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3254,7 +3254,7 @@ spec:
         - -c
       name: gitops-deprovision-app-install
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3339,7 +3339,7 @@ spec:
         - -c
       name: gitops-deprovision-cluster
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3458,7 +3458,7 @@ spec:
         - -c
       name: gitops-deprovision-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3551,7 +3551,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u-database
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -3634,7 +3634,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -3751,7 +3751,7 @@ spec:
         - -c
       name: gitops-deprovision-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -3861,7 +3861,7 @@ spec:
         - -c
       name: gitops-deprovision-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3964,7 +3964,7 @@ spec:
         - -c
       name: gitops-deprovision-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -4021,7 +4021,7 @@ spec:
         - -c
       name: gitops-deprovision-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4226,7 +4226,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -4324,7 +4324,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4416,7 +4416,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4628,7 +4628,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4721,7 +4721,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4812,7 +4812,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-workspace
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4905,7 +4905,7 @@ spec:
         - -c
       name: gitops-deprovision-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -5018,7 +5018,7 @@ spec:
         - -c
       name: gitops-dro
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5145,7 +5145,7 @@ spec:
         - -c
       name: gitops-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -5280,7 +5280,7 @@ spec:
         - -c
       name: gitops-jdbc-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -5376,7 +5376,7 @@ spec:
         - -c
       name: gitops-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -5498,7 +5498,7 @@ spec:
         - -c
       name: gitops-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5624,7 +5624,7 @@ spec:
         - -c
       name: gitops-license
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: shared-entitlement
 
@@ -5684,6 +5684,8 @@ spec:
       type: string
     - name: fvt_version_sls
       type: string
+    - name: fvt_version_facilities
+      type: string
 
     - name: fvt_blacklist_core
       type: string
@@ -5765,7 +5767,13 @@ spec:
     - name: launchfvt_manage_is
       type: string
       default: "true"
+    - name: launchfvt_facilities
+      type: string
+      default: "true"
 
+    - name: mas_app_channel_facilities
+      type: string
+      default: ""
     - name: mas_app_channel_iot
       type: string
       default: ""
@@ -5875,6 +5883,8 @@ spec:
         value: $(params.fvt_version_data_dictionary)
       - name: FVT_VERSION_SLS
         value: $(params.fvt_version_sls)
+      - name: FVT_VERSION_FACILITIES
+        value: $(params.fvt_version_facilities)
       - name: FVT_BLACKLIST_CORE
         value: $(params.fvt_blacklist_core)
       - name: FVT_WHITELIST_CORE
@@ -5911,6 +5921,10 @@ spec:
         value: $(params.launchfvt_visualinspection)
       - name: LAUNCHFVT_MANAGE_IS
         value: $(params.launchfvt_manage_is)
+      - name: LAUNCHFVT_FACILITIES
+        value: $(params.launchfvt_facilities)
+      - name: MAS_APP_CHANNEL_FACILITIES
+        value: $(params.mas_app_channel_facilities)
       - name: MAS_APP_CHANNEL_IOT
         value: $(params.mas_app_channel_iot)
       - name: MAS_APP_CHANNEL_MANAGE
@@ -5955,6 +5969,8 @@ spec:
         set -o pipefail
         trap '[[ $? -eq 1 ]] && mas must-gather --directory /workspace/mustgather --mas-instance-ids ${MAS_INSTANCE_ID} --extra-namespaces selenium' ERR EXIT
 
+
+
         get_trailing_number() {
           local input_string="$1"
           local trailing_number=$(echo $input_string | grep -Eo '[0-9]+$')
@@ -6111,6 +6127,10 @@ spec:
             MASAPP_APP="visualinspection.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
             check_argo_app_healthy "${MASAPP_APP}" 120
           fi
+          if [[ "$LAUNCHFVT_FACILITIES" == "true" ]]; then
+            MASAPP_APP="facilities.${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}" 240
@@ -6136,6 +6156,10 @@ spec:
             MASAPP_APP="iot.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
             check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}" 20
           fi
+          if [[ "$LAUNCHFVT_FACILITIES" == "true" ]]; then
+            MASAPP_APP="facilities.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
+            check_argo_app_healthy "${MAS_WORKSPACE_ID}.${MASAPP_APP}" 120
+          fi
           # Fourth wave
           if [[ "$LAUNCHFVT_MONITOR" == "true" ]]; then
             MASAPP_APP="monitor.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
@@ -6163,6 +6187,112 @@ spec:
 
         fi
 
+        echo '
+        # - Automated Initial User Tests
+        # -----------------------------------
+        '
+        # See https://pages.github.ibm.com/maximoappsuite/saas/walkthrough/#automated-creation-of-initial-users for details
+
+        # This test runs twice: once in the core phase and once again in the apps phase (to drive the logic that grants application roles and assigns Manage Security Groups to the initial users):
+        #  - The initial_user secret is primed with 2 primary and 2 secondary users with randomised emails
+        #  - The ibm-create-initial-users Job that reads the secret and runs creates the users is deleted so ArgoCD resyncs it, causing it to be rerun
+        #  - The test passes if the postsyncjobs app that contains the Job becomes healthy again after rerunning the Job
+        
+        # The results of the tests are registered with the FVT dashboard under ibm-mas-gitops/initial-users-automation-${LAUNCHER_ID}-${MAS_INSTANCE_ID}
+
+        # Assisted by watsonx Code Assistant 
+        get_random_email() {
+          local random_part=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)
+          echo "${random_part}@example.com"
+        }
+
+        initial_user_test() {
+          # Because some of the functions in gitops_utils call exit 1,
+          # it's important that this function is only called from a subshell
+          # otherwise if it fails it might cause the whole script (and thus the FVT run) to exit
+
+          # Establish the initial_users secret
+          export AVP_TYPE="aws" # required by sm_login (only AWS supported at present)
+          sm_login || return $?
+
+          argocd_login || return $?
+
+          # First check the POSTSYNCJOBS_APP is healthy so we know the initial users job has run already (and so will exist)
+          POSTSYNCJOBS_APP="postsyncjobs.${CLUSTER_NAME}.${MAS_INSTANCE_ID}"
+          check_argo_app_healthy "${POSTSYNCJOBS_APP}" 20 || return $?
+
+          IU_SECRET_NAME="${ACCOUNT_ID}/${CLUSTER_NAME}/${MAS_INSTANCE_ID}/initial_users" 
+          IU_SECRET_VALUE="{\"$(get_random_email)\": \"primary,john,smith\", \"$(get_random_email)\": \"primary,jane,doe\", \"$(get_random_email)\": \"secondary,joe,bloggs\", \"$(get_random_email)\": \"secondary,billy,bob\"}"
+          IU_SECRET_TAGS="[{\"Key\": \"source\", \"Value\": \"gitops-mas-fvt-preparer\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"cluster\", \"Value\": \"${CLUSTER_NAME}\"}]"
+          
+          echo "Creating ${IU_SECRET_NAME} secret"
+          sm_update_secret "${IU_SECRET_NAME}" "${IU_SECRET_VALUE}" "${IU_SECRET_TAGS}" || return $?
+
+          # The Job will have already run when MAS Core was installed during the first phase of our FVT process
+          # Since no initial_users secret existed at that time, it will not have done anything
+          # The only way to get it to rerun and pick up the new initial_secret is to delete the Job and get ArgoCD to resync
+          # the application that the Job belongs to:
+
+          IU_JOB_LIST=$(oc get jobs -n mas-${MAS_INSTANCE_ID}-postsyncjobs -o jsonpath='{range .items[?(@.spec.template.metadata.labels.app=="ibm-create-initial-users-l")]}{.metadata.name}{"\n"}{end}') || return $?
+          echo "Deleting the following ibm-create-initial-user Jobs in mas-${MAS_INSTANCE_ID}-postsyncjobs namespace:"
+          echo "${IU_JOB_LIST}"
+          echo "${IU_JOB_LIST}"
+          for IU_JOB in $IU_JOB_LIST; do
+              oc delete job "${IU_JOB}" -n mas-${MAS_INSTANCE_ID}-postsyncjobs || return $?
+          done
+
+          # Force a resync of the postsyncjobs app
+          echo "Forcing ${POSTSYNCJOBS_APP} to resync"
+          argocd_sync "${POSTSYNCJOBS_APP}" || return $?
+          check_argo_app_healthy "${POSTSYNCJOBS_APP}" 20 || return $?
+        }
+
+
+        IU_SYNC_START_TIME=$(date +%s)
+        IU_SYNC_LOGS="$(initial_user_test 2>&1 | tee /dev/fd/2)"  
+        IU_RC=$? # NOTE: set -o pipefail ensures we get exit code of initial_user_test (not tee)
+        IU_SYNC_LOGS_CDATA=$(printf '%s\n' "${IU_SYNC_LOGS}"| sed 's|\]\]>|]]]]><![CDATA[>|g') # guard against any "]]>" in the output
+        IU_SYNC_ELAPSED_TIME=$(($(date +%s)-$IU_SYNC_START_TIME))
+
+        if [[ "${IU_RC}" == "0" ]]; then
+          IU_TEST_RESULT_XML='
+            <testsuites disabled="0" errors="0" failures="0" tests="1" time="'${IU_SYNC_ELAPSED_TIME}'">
+              <testsuite disabled="0" errors="0" failures="0" name="initial-users-automation-'${MAS_INSTANCE_ID}'" skipped="0" tests="1" time="'${IU_SYNC_ELAPSED_TIME}'">
+                <testcase name="Sync" time="'${IU_SYNC_ELAPSED_TIME}'" classname="Sync" />
+              </testsuite>
+            </testsuites>
+          '
+        else
+          IU_TEST_RESULT_XML='
+            <testsuites disabled="0" errors="0" failures="1" tests="1" time="'${IU_SYNC_ELAPSED_TIME}'">
+              <testsuite disabled="0" errors="0" failures="1" name="initial-users-automation-'${MAS_INSTANCE_ID}'" skipped="0" tests="1" time="'${IU_SYNC_ELAPSED_TIME}'">
+                <testcase name="Sync" time="'${IU_SYNC_ELAPSED_TIME}'" classname="Sync">
+                  <failure message="Initial user creation failed (rc '${IU_RC}')" type="Failure"><![CDATA[
+                    '${IU_SYNC_LOGS_CDATA}'
+                  ]]></failure>
+                </testcase>
+              </testsuite>
+            </testsuites>
+          '       
+        fi
+
+
+
+        # Create junit xml for one testsuite of the parent argo app, and the testcase of sync
+        # DEVOPS_MONGO_URI=<set in secure properties>
+        # DEVOPS_ENVIRONMENT=<param>
+        # DEVOPS_BUILD_NUMBER=<param>
+        export DEVOPS_SUITE_NAME="initial-users-automation-${LAUNCHER_ID}-${MAS_INSTANCE_ID}"
+        export JUNIT_OUTPUT_DIR="/tmp/initial-users-automation-${LAUNCHER_ID}-${MAS_INSTANCE_ID}"
+        export PRODUCT_ID="ibm-mas-gitops"
+
+        mkdir -p $JUNIT_OUTPUT_DIR
+        echo ${IU_TEST_RESULT_XML} > $JUNIT_OUTPUT_DIR/output.xml
+
+        echo "Run save-junit-to-mongo.py"
+        python3 /opt/app-root/src/save-junit-to-mongo.py
+        # -----------------------------------
+
         echo "Sleeping for 180 seconds to give postsync job a chance to run before creating sync window"
         sleep 180
 
@@ -6213,7 +6343,7 @@ spec:
         - -c
       name: gitops-mas-fvt-preparer
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -6263,6 +6393,8 @@ spec:
     - name: mas_app_install_plan_assist
       type: string
       default: "Automatic"
+    - name: mas_app_channel_facilities
+      type: string
     - name: mas_app_install_plan_facilities
       type: string
       default: "Automatic"
@@ -6370,6 +6502,8 @@ spec:
         value: $(params.mas_app_channel_assist)
       - name: MAS_APP_INSTALL_PLAN_ASSIST
         value: $(params.mas_app_install_plan_assist)
+      - name: MAS_APP_CHANNEL_FACILITIES
+        value: $(params.mas_app_channel_facilities)
       - name: MAS_APP_INSTALL_PLAN_FACILITIES
         value: $(params.mas_app_install_plan_facilities)
       - name: MAS_APP_CHANNEL_IOT
@@ -6615,6 +6749,9 @@ spec:
             echo "gitops-mas-initiator: set .launchfvt.assist to false"
           fi
         fi
+        if [ -n $MAS_APP_CHANNEL_FACILITIES ]; then
+          yq -i '(. | select(has("facilities")) |  .facilities.app_channel) = env(MAS_APP_CHANNEL_FACILITIES)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
+        fi
         if [ -n $MAS_APP_CHANNEL_IOT ]; then
           yq -i '(. | select(has("iot")) |  .iot.app_channel) = env(MAS_APP_CHANNEL_IOT)' gitops/$ACCOUNT/$REGION/$CLUSTER_NAME/$MAS_INSTANCE_ID/mas-apps-params.yaml
         fi
@@ -6699,7 +6836,7 @@ spec:
         - -c
       name: gitops-mas-initiator
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6807,7 +6944,7 @@ spec:
         - -c
       name: gitops-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -6933,7 +7070,7 @@ spec:
         - -c
       name: gitops-nvidia-gpu
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7051,7 +7188,7 @@ spec:
         - -c
       name: gitops-process-mongo-user
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7107,7 +7244,7 @@ spec:
         - -c
       name: gitops-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7294,7 +7431,7 @@ spec:
         - -c
       name: gitops-suite-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7452,7 +7589,7 @@ spec:
         - -c
       name: gitops-suite-app-install
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7558,7 +7695,7 @@ spec:
         - -c
       name: gitops-suite-certs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: certificates
@@ -7728,7 +7865,7 @@ spec:
         - -c
       name: gitops-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -7828,7 +7965,7 @@ spec:
         - -c
       name: gitops-suite-dns
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -7952,7 +8089,7 @@ spec:
         - -c
       name: gitops-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -8053,7 +8190,7 @@ spec:
         - -c
       name: gitops-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8464,7 +8601,7 @@ spec:
         - -c
       name: gitops-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 
@@ -8584,7 +8721,7 @@ spec:
         - -c
       name: gitops-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8686,7 +8823,7 @@ spec:
         - -c
       name: gitops-suite-workspace
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -9029,7 +9166,7 @@ spec:
         - -c
       name: gitops-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -9079,7 +9216,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -9213,7 +9350,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -9455,7 +9592,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9671,7 +9808,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kmodels
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
@@ -9849,7 +9986,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9892,7 +10029,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -10009,7 +10146,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10045,7 +10182,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10087,7 +10224,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10129,7 +10266,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10171,7 +10308,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10213,7 +10350,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10339,7 +10476,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -10407,7 +10544,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10643,7 +10780,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - odh
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
@@ -10819,7 +10956,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -11214,12 +11351,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -11414,7 +11551,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -11503,7 +11640,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -11566,7 +11703,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -11641,7 +11778,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -11742,7 +11879,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -11885,7 +12022,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -11952,7 +12089,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -12023,7 +12160,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -12213,7 +12350,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -12462,7 +12599,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -12550,7 +12687,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -12615,7 +12752,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -12685,7 +12822,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -12752,12 +12889,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-suite-verify exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: suite-post-verify
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       script: |
         #!/usr/bin/env bash
@@ -12885,7 +13022,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -12966,7 +13103,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -13029,7 +13166,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -13115,7 +13252,7 @@ spec:
       description: "The value to set"
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -13162,7 +13299,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -13243,7 +13380,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -13303,7 +13440,7 @@ spec:
 
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:13.20.0
+      image: quay.io/ibmmas/cli:13.22.0
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:
@@ -20634,6 +20771,8 @@ spec:
       type: string
     - name: fvt_version_sls
       type: string
+    - name: fvt_version_facilities
+      type: string
 
     - name: fvt_blacklist_core
       type: string
@@ -20696,6 +20835,9 @@ spec:
     - name: launchfvt_manage_is
       type: string
       default: "true"
+    - name: launchfvt_facilities
+      type: string
+      default: "true"
 
     - name: mas_app_channel_iot
       type: string
@@ -20718,6 +20860,9 @@ spec:
     - name: mas_app_channel_predict
       type: string
       default: ""
+    - name: mas_app_channel_facilities
+      type: string
+      default: ""
 
     - name: ldap_url
       type: string
@@ -20794,6 +20939,8 @@ spec:
           value: $(params.fvt_version_data_dictionary)
         - name: fvt_version_sls
           value: $(params.fvt_version_sls)
+        - name: fvt_version_facilities
+          value: $(params.fvt_version_facilities)
 
         - name: fvt_blacklist_core
           value: $(params.fvt_blacklist_core)
@@ -20837,6 +20984,8 @@ spec:
           value: $(params.launchfvt_visualinspection)
         - name: launchfvt_manage_is
           value: $(params.launchfvt_manage_is)
+        - name: launchfvt_facilities
+          value: $(params.launchfvt_facilities)
 
         - name: mas_app_channel_iot
           value: $(params.mas_app_channel_iot)
@@ -20852,6 +21001,8 @@ spec:
           value: $(params.mas_app_channel_optimizer)
         - name: mas_app_channel_predict
           value: $(params.mas_app_channel_predict)
+        - name: mas_app_channel_facilities
+          value: $(params.mas_app_channel_facilities)
 
         - name: ldap_url
           value: $(params.ldap_url)
@@ -20956,6 +21107,9 @@ spec:
     - name: mas_app_channel_visualinspection
       type: string
       default: ""
+    - name: mas_app_channel_facilities
+      type: string
+      default: ""
     - name: github_pat
       type: string
     - name: ibmcloud_apikey
@@ -21068,6 +21222,8 @@ spec:
           value: $(params.mas_app_channel_predict)
         - name: mas_app_channel_visualinspection
           value: $(params.mas_app_channel_visualinspection)
+        - name: mas_app_channel_facilities
+          value: $(params.mas_app_channel_facilities)
         - name: github_pat
           value: $(params.github_pat)
         - name: manual_certs_control_flag
@@ -21162,6 +21318,9 @@ spec:
     - name: mas_app_channel_visualinspection
       type: string
       default: ""
+    - name: mas_app_channel_facilities
+      type: string
+      default: ""
     - name: github_pat
       type: string
     - name: ibmcloud_apikey
@@ -21254,6 +21413,8 @@ spec:
           value: $(params.mas_app_channel_predict)
         - name: mas_app_channel_visualinspection
           value: $(params.mas_app_channel_visualinspection)
+        - name: mas_app_channel_facilities
+          value: $(params.mas_app_channel_facilities)
         - name: github_pat
           value: $(params.github_pat)
         - name: manual_certs_control_flag
@@ -27484,6 +27645,11 @@ kind: Pipeline
 metadata:
   name: mas-upgrade
 spec:
+  workspaces:
+    # The generated configuration files
+    - name: shared-configs
+    # PodTemplates configurations
+    - name: shared-pod-templates
   params:
     # 1. Common Parameters
     # -------------------------------------------------------------------------
@@ -27518,109 +27684,1195 @@ spec:
     - name: mas_instance_id
       type: string
       default: ""
-
-    # 2. Upgrade
+    
+    # 2. Installation (only needed if Manage Foundation is going to be installed)
     # -------------------------------------------------------------------------
-    - name: skip_compatibility_check
+    # Storage Class Selection
+    # -----------------------------------------------------------------------------
+    - name: storage_class_rwo
       type: string
-      default: "False"
-      description: Skip performing compatiblity checks before upgrade
+      default: ""
+      description: ReadWriteOnce storage class
+    - name: storage_class_rwx
+      type: string
+      default: ""
+      description: ReadWriteMany storage class
+
+    # Entitlement
+    # -----------------------------------------------------------------------------
+    - name: ibm_entitlement_key
+      type: string
+      description: IBM Entitlement Key
 
     # Pipeline config
+    # -----------------------------------------------------------------------------
     - name: skip_pre_check
       type: string
       default: ""
 
-    # MAS Configuration - Application Channels
-    # -------------------------------------------------------------------------
-    - name: mas_app_channel_iot
+    # Cluster config
+    - name: ocp_ingress_tls_secret_name
       type: string
-      description: Subscription channel for IoT application operator
       default: ""
-    - name: mas_app_channel_manage
+
+    # IBM Cloud
+    # -----------------------------------------------------------------------------
+    - name: ibmcloud_apikey
       type: string
-      description: Subscription channel for Manage application operator
       default: ""
-    - name: mas_app_channel_monitor
+    - name: ibmcloud_resourcegroup
       type: string
-      description: Subscription channel for Monitor application operator
       default: ""
-    - name: mas_app_channel_optimizer
+
+    # Dependencies - ECK
+    # -----------------------------------------------------------------------------
+    - name: eck_action
+      type: string
+      default: "no-action"
+
+    - name: eck_enable_elasticsearch
       type: string
-      description: Subscription channel for Optimizer application operator
       default: ""
-    - name: mas_app_channel_predict
+    - name: eck_enable_kibana
       type: string
-      description: Subscription channel for Predict application operator
       default: ""
-    - name: mas_app_channel_assist
+    - name: eck_enable_logstash
       type: string
-      description: Subscription channel for Assist application operator
       default: ""
-    - name: mas_app_channel_visualinspection
+    - name: eck_enable_filebeat
       type: string
-      description: Subscription channel for MVI application operator
       default: ""
-    # - name: mas_app_channel_aibroker
-    #   type: string
-    #   description: Subscription channel for AI Broker application operator
-    #   default: ""
 
+    - name: eck_remote_es_hosts
+      type: string
+      default: ""
+    - name: eck_remote_es_username
+      type: string
+      default: ""
+    - name: eck_remote_es_password
+      type: string
+      default: ""
 
-  tasks:
-    # 1. Wait for approval & verify health of the cluster before we change anything
+
+    # Dependencies - Turbonomic
+    # -----------------------------------------------------------------------------
+    # KubeTurbo Configuration
     # -------------------------------------------------------------------------
-    - name: waitfor-approval
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-devops-wait-for-configmap-v2
-      params:
-        - name: image_pull_policy
-          value: $(params.image_pull_policy)
-        - name: configmap_name
-          value: approval-upgrade
+    - name: kubeturbo_namespace
+      type: string
+      description: MongoDb provider
+      default: ""
 
-    - name: pre-upgrade-check
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-devops-ocp-verify-all
-      params:
-        # Controls the image pull policy for the ibmmas/cli image
-        - name: image_pull_policy
-          value: $(params.image_pull_policy)
+    # Turbonomic Configuration
+    # -------------------------------------------------------------------------
+    # Both turbonomic_target_name & turbonomic_server_url need to be set, or the turbonomic role will not execute
+    - name: turbonomic_target_name
+      type: string
+      default: ""
+    - name: turbonomic_server_url
+      type: string
+      default: ""
+    - name: turbonomic_server_version
+      type: string
+      default: ""
 
-        # Pipeline Config
-        - name: skip_pre_check
-          value: $(params.skip_pre_check)
-        - name: devops_suite_name
-          value: pre-upgrade-check
-      when:
-        - input: "$(params.skip_pre_check)"
-          operator: notin
-          values: ["True", "true"]
+    # Turbonomic Authentication
+    - name: turbonomic_username
+      type: string
+      default: ""
+    - name: turbonomic_password
+      type: string
+      default: ""
 
-      runAfter:
-        - waitfor-approval
 
+    # Dependencies - SLS
+    # -----------------------------------------------------------------------------
+    - name: sls_namespace
+      type: string
+      default: ""
+    - name: sls_entitlement_file
+      type: string
+      default: ""
+    - name: sls_mongodb_cfg_file
+      type: string
+      # The default value works for the default in-cluster install, it will need
+      # to be modified if the mongodb namespace is changed, or if using BYO MongoDb
+      default: "/workspace/configs/mongo-mongoce.yml"
+    - name: sls_catalog_source
+      type: string
+      default: ""
+    - name: sls_channel
+      type: string
+      default: ""
+    - name: sls_icr_cpopen
+      type: string
+      default: ""
+    - name: sls_action
+      type: string
+      default: ""
+
+    # Dependencies - MongoDb
+    # -----------------------------------------------------------------------------
+    - name: mongodb_namespace
+      type: string
+      default: ""
+    - name: mongodb_storage_class
+      type: string
+      default: ""
+    - name: mongodb_replicas
+      type: string
+      description: Optional configuration for mongodb replicas
+      default: ""
+    - name: mongodb_cpu_requests
+      type: string
+      description: Optional configuration for mongodb cpu requests
+      default: ""
+    - name: mongodb_provider
+      type: string
+      description: MongoDb provider
+      default: ""
+    - name: mongodb_version
+      type: string
+      description: MongoDb version
+      default: ""
+    - name: mongodb_action
+      type: string
+      description: MongoDb action
+      default: ""
 
-    # 2. Suite Upgrade (Phase 1)
+    # Dependencies - IBM Cloud MongoDb
     # -------------------------------------------------------------------------
-    - name: core-upgrade
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-devops-suite-upgrade
-      runAfter:
-        - pre-upgrade-check
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_channel
-          value: $(params.mas_channel)
-        - name: skip_compatibility_check
-          value: $(params.skip_compatibility_check)
+    - name: ibm_mongo_name
+      type: string
+      description: IBM Cloud MongoDb instance name
+      default: ""
+    - name: ibm_mongo_resourcegroup
+      type: string
+      description: IBM Cloud MongoDb resource group
+      default: ""
+    - name: ibm_mongo_region
+      type: string
+      description: IBM Cloud MongoDb instance region
+      default: ""
+    - name: ibm_mongo_admin_password
+      type: string
+      description: IBM Cloud MongoDb admin password
+      default: ""
+
+    # Dependencies (Kafka) - General variables
+    - name: kafka_action_system
+      type: string
+      description: Set to 'install' to set up a Kafka instance for the whole suite
+      default: "none"
+    - name: kafka_provider
+      type: string
+      description: Kafka provider
+      default: ""
+    - name: kafka_version
+      type: string
+      description: Kafka version
+      default: ""
+
+    # Dependencies - AMQ Streams / Strimzi (Kafka)
+    # -----------------------------------------------------------------------------
+    - name: kafka_namespace
+      type: string
+      default: ""
+    - name: kafka_cluster_size
+      type: string
+      default: ""
+    - name: kafka_user_name
+      type: string
+      default: ""
+
+    # Dependencies - AWS MSK (Kafka)
+    # -------------------------------------------------------------------------
+    - name: vpc_id
+      type: string
+      default: ""
+    - name: aws_kafka_user_name
+      type: string
+      default: ""
+    - name: aws_kafka_user_password
+      type: string
+      default: ""
+    - name: aws_msk_instance_type
+      type: string
+      default: ""
+    - name: aws_msk_instance_number
+      type: string
+      default: ""
+    - name: aws_msk_volume_size
+      type: string
+      default: ""
+    - name: aws_msk_cidr_az1
+      type: string
+      default: ""
+    - name: aws_msk_cidr_az2
+      type: string
+      default: ""
+    - name: aws_msk_cidr_az3
+      type: string
+      default: ""
+    - name: aws_msk_ingress_cidr
+      type: string
+      default: ""
+    - name: aws_msk_egress_cidr
+      type: string
+      default: ""
+
+    # Dependencies - IBM Cloud Event Streams (Kafka)
+    # -----------------------------------------------------------------------------
+    - name: eventstreams_resourcegroup
+      type: string
+      default: ""
+    - name: eventstreams_name
+      type: string
+      default: ""
+    - name: eventstreams_location
+      type: string
+      default: ""
+    - name: eventstreams_retention
+      type: string
+      default: ""
+    - name: eventstreams_create_manage_jms_topics
+      type: string
+      default: ""
+
+    # Dependencies - NVIDIA GPU
+    # -----------------------------------------------------------------------------
+    - name: gpu_namespace
+      type: string
+      description: Optional. Nvidia gpu namespace
+      default: ""
+    - name: gpu_channel
+      type: string
+      description: Optional. Nvidia gpu channel for install and updates
+      default: ""
+    - name: nfd_namespace
+      type: string
+      description: Optional. Node feature discovery namespace
+      default: ""
+    - name: nfd_channel
+      type: string
+      description: Optional. Node feature discovery channel for install and updates
+      default: ""
+
+    # Dependencies - DB2
+    # -----------------------------------------------------------------------------
+    # Dependencies - Db2 - Instance
+    # -------------------------------------------------------------------------
+    - name: db2_namespace
+      type: string
+      description: Namespace to create Db2uCluster instances
+      default: "db2u"
+    - name: db2_channel
+      type: string
+      description: Subscription channel for the Db2 Universal Operator
+      default: ""
+    - name: db2_dbname
+      type: string
+      description: The name of the database created
+      default: "BLUDB"
+    - name: db2_version
+      type: string
+      description: The version of the database created
+      default: ""
+    - name: db2_type
+      type: string
+      description: The type of the database created
+      default: ""
+    - name: db2_timezone
+      type: string
+      description: The timezone of the database created
+      default: ""
+    - name: db2_workload
+      type: string
+      description: The workload profile for the db2 instance ('PUREDATA_OLAP' or 'ANALYTICS')
+      default: "ANALYTICS"
+    - name: db2_4k_device_support
+      type: string
+      description: Enable 4K device support.  Set to 'ON' or 'OFF'
+      default: "ON"
+    - name: db2_table_org
+      type: string
+      description: Customize the way database tables will be organized.  Set to 'ROW' or 'COLUMN'
+      default: "ROW"
+
+    # Dependences - Db2 - Node scheduling
+    # -------------------------------------------------------------------------
+    - name: db2_affinity_key
+      type: string
+      description: Configure node affinity (1/2)
+      default: ""
+    - name: db2_affinity_value
+      type: string
+      description: Configure node affinity (2/2)
+      default: ""
+    - name: db2_tolerate_key
+      type: string
+      description: Configure node tolerations (1/3)
+      default: ""
+    - name: db2_tolerate_value
+      type: string
+      description: Configure node tolerations (2/3)
+      default: ""
+    - name: db2_tolerate_effect
+      type: string
+      description: Configure node tolerations (3/3)
+      default: ""
+
+    # Dependences - Db2 - CPU requests and limits
+    # -------------------------------------------------------------------------
+    - name: db2_cpu_requests
+      type: string
+      description: Define the Kubernetes CPU request for the Db2 pod
+      default: "4000m"
+    - name: db2_cpu_limits
+      type: string
+      description: Define the Kubernetes CPU limit for the Db2 pod
+      default: "6000m"
+
+    # Dependencies - Db2 - Memory requests and limits
+    # -------------------------------------------------------------------------
+    - name: db2_memory_requests
+      type: string
+      description: Define the Kubernetes memory request for the Db2 pod
+      default: "8Gi"
+    - name: db2_memory_limits
+      type: string
+      description: Define the Kubernetes memory limit for the Db2 pod
+      default: "16Gi"
+
+    # Dependencies - Db2 - Storage - Capacity
+    # -------------------------------------------------------------------------
+    - name: db2_meta_storage_class
+      type: string
+      description: Storage class (metadata)
+      default: ""
+    - name: db2_meta_storage_size
+      type: string
+      description: Storage capacity (metadata)
+      default: "20Gi"
+    - name: db2_backup_storage_class
+      type: string
+      description: Storage class (backup)
+      default: ""
+    - name: db2_backup_storage_size
+      type: string
+      description: Storage capacity (backup)
+      default: "100Gi"
+    - name: db2_logs_storage_class
+      type: string
+      description: Storage class (logs)
+      default: ""
+    - name: db2_logs_storage_size
+      type: string
+      description: Storage capacity (logs)
+      default: "100Gi"
+    - name: db2_temp_storage_class
+      type: string
+      description: Storage class (temp)
+      default: ""
+    - name: db2_temp_storage_size
+      type: string
+      description: Storage capacity (temp)
+      default: "100Gi"
+    - name: db2_data_storage_class
+      type: string
+      description: Storage class (data)
+      default: ""
+    - name: db2_data_storage_size
+      type: string
+      description: Storage capacity (data)
+      default: "100Gi"
+
+    # Dependencies - Db2 - Storage - Access mode
+    # -------------------------------------------------------------------------
+    - name: db2_meta_storage_accessmode
+      type: string
+      description: Optional override for db2 meta storage access mode
+      default: ""
+    - name: db2_backup_storage_accessmode
+      type: string
+      description: Optional override for db2 backup storage access mode
+      default: ""
+    - name: db2_logs_storage_accessmode
+      type: string
+      description: Optional override for db2 logs storage access mode
+      default: ""
+    - name: db2_temp_storage_accessmode
+      type: string
+      description: Optional override for db2 temp storage access mode
+      default: ""
+    - name: db2_data_storage_accessmode
+      type: string
+      description: Optional override for db2 data storage access mode
+      default: ""
+
+    # Dependencies - Db2 - LDAP
+    # -------------------------------------------------------------------------
+    - name: db2_ldap_username
+      type: string
+      description: Define the username of db2 in the local LDAP registry. If this is defined, the LDAP user will be the user identity passed into the MAS JDBC configuration.
+      default: ""
+    - name: db2_ldap_password
+      type: string
+      description: Define the password of the db2 user in the local LDAP registry. Must define when db2_ldap_username is used.
+      default: ""
+    - name: db2_action_system
+      type: string
+      description: Set to 'install' to set up a Db2 instance for the whole suite
+      default: "none"
+    - name: db2_action_manage
+      type: string
+      description: Set to 'install' to set up a Db2 instance for Manage
+      default: "none"
+    - name: db2_binding_manage
+      type: string
+      description: Set to 'system' if using the shared system JDBC configuration, or 'workspace-application' if using a dedicated JDBC configuration.
+      default: ""
+
+    # Dependencies - CP4D
+    # -----------------------------------------------------------------------------
+    - name: cpd_operators_namespace
+      type: string
+      default: ""
+    - name: cpd_instance_namespace
+      type: string
+      default: ""
+    - name: cpd_primary_storage_class
+      type: string
+      default: ""
+    - name: cpd_metadata_storage_class
+      type: string
+      default: ""
+
+    # Dependencies - CP4D Services
+    # -----------------------------------------------------------------------------
+    - name: cpd_product_version
+      type: string
+      default: ""
+    - name: cpd_install_spss
+      type: string
+      default: ""
+    - name: cpd_install_cognos
+      type: string
+      default: ""
+    - name: cpd_install_ws
+      type: string
+      default: ""
+    - name: cpd_install_wml
+      type: string
+      default: ""
+    - name: cpd_install_ae
+      type: string
+      default: ""
+
+    # Dependencies - UDS
+    # -----------------------------------------------------------------------------
+    - name: uds_contact_email
+      type: string
+      default: ""
+    - name: uds_contact_firstname
+      type: string
+      default: ""
+    - name: uds_contact_lastname
+      type: string
+      default: ""
+    - name: uds_event_scheduler_frequency
+      type: string
+      default: ""
+    - name: uds_action
+      type: string
+      default: ""
+    - name: dro_namespace
+      type: string
+      default: ""
+    - name: mas_segment_key
+      type: string
+      default: ""
+
+    # Dependencies - AppConnect
+    # -----------------------------------------------------------------------------
+    # Subscription Channel
+    - name: appconnect_channel
+      type: string
+      default: ""
+    # Dashboard Configuration
+    - name: appconnect_dashboard_version
+      type: string
+      default: ""
+    - name: appconnect_dashboard_name
+      type: string
+      default: ""
+    # License
+    - name: appconnect_license_id
+      type: string
+      default: ""
+    # Storage Class
+    - name: appconnect_storage_class
+      type: string
+      default: ""
+
+
+    # Dependencies - COS
+    # -----------------------------------------------------------------------------
+    - name: cos_type
+      type: string
+      description: COS Provider (ibm or ocs)
+      default: ""
+    - name: cos_resourcegroup
+      type: string
+      description: Name of an existing COS Resource Group in IBM Cloud account
+      default: ""
+    - name: cos_apikey
+      type: string
+      default: ""
+    - name: cos_instance_name
+      type: string
+      description: Name of COS instance in IBM Cloud account
+      default: ""
+    - name: cos_action
+      type: string
+      description: COS action to be performed (provision or deprovision)
+      default: ""
+    - name: cos_use_hmac
+      type: string
+      description: Optional boolean variable weather hmac is enabled or not
+      default: ""
+
+    # MAS Integration - Grafana
+    # -----------------------------------------------------------------------------
+    - name: grafana_action
+      type: string
+      description: Set to 'none' to skip Grafana installation
+      default: "install"
+    - name: grafana_namespace
+      type: string
+      default: ""
+    - name: grafana_v5_namespace
+      type: string
+      default: ""
+    - name: grafana_instance_storage_class
+      type: string
+      default: ""
+    - name: grafana_instance_storage_size
+      type: string
+      default: ""
+    - name: grafana_major_version
+      type: string
+      default: ""
+
+    # Certificate Manager
+    # -----------------------------------------------------------------------------
+    - name: cert_manager_provider
+      type: string
+      default: ""
+    - name: cert_manager_action
+      type: string
+      default: ""
+
+    # MAS DNS Integrations - General
+    # -----------------------------------------------------------------------------
+    - name: dns_provider
+      type: string
+      default: ""
+
+    # MAS DNS Integrations - Cloudflare Support
+    # -----------------------------------------------------------------------------
+    - name: cloudflare_email
+      type: string
+      default: ""
+    - name: cloudflare_apitoken
+      type: string
+      default: ""
+    - name: cloudflare_zone
+      type: string
+      default: ""
+    - name: cloudflare_subdomain
+      type: string
+      default: ""
+
+    # MAS DNS Integrations - IBM Cloud Internet Services Support
+    # -----------------------------------------------------------------------------
+    - name: cis_email
+      type: string
+      default: ""
+    - name: cis_apikey
+      type: string
+      default: ""
+    - name: cis_crn
+      type: string
+      default: ""
+    - name: cis_subdomain
+      type: string
+      default: ""
+
+    # MAS DNS Integrations - CIS Security Enhancement Support
+    # -------------------------------------------------------------------------
+    - name: cis_service_name
+      type: string
+      default: ""
+    - name: cis_enhanced_security
+      type: string
+      default: "false"
+    - name: override_edge_certs
+      type: string
+      default: "false"
+    - name: cis_proxy
+      type: string
+      default: "false"
+
+    # AWS basic info
+    # -------------------------------------------------------------------------
+    - name: aws_access_key_id
+      type: string
+      default: ""
+    - name: aws_secret_access_key
+      type: string
+      default: ""
+    - name: aws_region
+      type: string
+      default: ""
+
+    # MAS DNS Integrations - AWS Route 53
+    # -------------------------------------------------------------------------
+    - name: route53_hosted_zone_name
+      type: string
+      default: ""
+    - name: route53_hosted_zone_region
+      type: string
+      default: ""
+    - name: route53_email
+      type: string
+      default: ""
+    - name: route53_subdomain
+      type: string
+      default: ""
+
+    # IBM Operator Catalog
+    # -------------------------------------------------------------------------
+    - name: mas_catalog_source
+      type: string
+      default: ibm-operator-catalog
+    - name: mas_catalog_version
+      type: string
+      default: v8-amd64
+    - name: mas_catalog_digest
+      type: string
+      description: Set when using dev or pre-release catalog in airgap
+      default: ""
+
+    # MAS Configuration - Workspace
+    # -------------------------------------------------------------------------
+    - name: mas_workspace_id
+      type: string
+      description: Workspace ID used to configure all applications
+      default: ""
+    - name: mas_workspace_name
+      type: string
+      description: Workspace Name used when setting up the workspace
+      default: My Workspace
+
+    # MAS Configuration - Application Channels
+    # -------------------------------------------------------------------------
+    - name: mas_app_channel_iot
+      type: string
+      description: Subscription channel for IoT application operator
+      default: ""
+    - name: mas_app_channel_manage
+      type: string
+      description: Subscription channel for Manage application operator
+      default: ""
+    - name: mas_app_channel_monitor
+      type: string
+      description: Subscription channel for Monitor application operator
+      default: ""
+    - name: mas_app_channel_optimizer
+      type: string
+      description: Subscription channel for Optimizer application operator
+      default: ""
+    - name: mas_app_channel_predict
+      type: string
+      description: Subscription channel for Predict application operator
+      default: ""
+    - name: mas_app_channel_assist
+      type: string
+      description: Subscription channel for Assist application operator
+      default: ""
+    - name: mas_app_channel_visualinspection
+      type: string
+      description: Subscription channel for MVI application operator
+      default: ""
+    # - name: mas_app_channel_aibroker
+    #   type: string
+    #   description: Subscription channel for AI Broker application operator
+    #   default: ""
+
+
+    # MAS Configuration
+    # -----------------------------------------------------------------------------
+    - name: mas_domain
+      type: string
+      default: ""
+    - name: mas_cluster_issuer
+      type: string
+      default: ""
+    - name: mas_icr_cp
+      type: string
+      default: ""
+    - name: mas_icr_cpopen
+      type: string
+      default: ""
+    - name: mas_annotations
+      type: string
+      default: ""
+    - name: mas_trust_default_cas
+      type: string
+      default: ""
+      description: Optional boolean parameter that when set to False, disables the normal trust of well known public certificate authorities
+    - name: enable_ipv6
+      type: string
+      default: "False"
+      description: Optional boolean parameter that when set to True, enables IPv6
+    - name: mas_manual_cert_mgmt
+      type: string
+      default: "False"
+      description: Optional boolean parameter that when set to True, indicates that manually created certificates will be used to certify MAS and application routes
+    - name: mas_add_channel
+      type: string
+      default: ""
+      description: Data Dictionary subscription channel
+    - name: mas_add_catalog
+      type: string
+      default: ""
+      description: Data Dictionary catalog source
+    - name: mas_enable_walkme
+      type: string
+      default: "True"
+      description: Optional parameter to enable or disable guided tour
+
+    # Special characters configuration
+    - name: mas_special_characters
+      type: string
+      default: ''
+
+    # SSO Configuration
+    # -----------------------------------------------------------------------------
+    - name: idle_timeout
+      type: string
+      default: ''
+    - name: idp_session_timeout
+      type: string
+      default: ''
+    - name: access_token_timeout
+      type: string
+      default: ''
+    - name: refresh_token_timeout
+      type: string
+      default: ''
+    - name: default_idp
+      type: string
+      default: ''
+    - name: seamless_login
+      type: string
+      default: ''
+    - name: sso_cookie_name
+      type: string
+      default: ''
+    - name: allow_default_sso_cookie_name
+      type: string
+      default: ''
+    - name: use_only_custom_cookie_name
+      type: string
+      default: ''
+    - name: disable_ldap_cookie
+      type: string
+      default: ''
+    - name: allow_custom_cache_key
+      type: string
+      default: ''
+
+    # MAS Configuration - Superuser Account
+    # -----------------------------------------------------------------------------
+    - name: mas_superuser_username
+      type: string
+      default: ""
+    - name: mas_superuser_password
+      type: string
+      default: ""
+
+    # MAS Application Configuration - IoT Application
+    # -----------------------------------------------------------------------------
+    - name: mas_app_settings_iot_deployment_size
+      type: string
+      description: controls the workload size of iot containers
+      default: ""
+    - name: mas_app_settings_iot_mqttbroker_pvc_storage_class
+      type: string
+      description: defines storage class for iot messagesight
+      default: ""
+    - name: mas_app_settings_iot_fpl_pvc_storage_class
+      type: string
+      description: defines storage class for iot functions pipeline component
+      default: ""
+
+    # MAS Application Configuration - Manage Application
+    # -----------------------------------------------------------------------------
+    - name: mas_appws_bindings_jdbc_manage
+      type: string
+      description: Select the JDBC configuration to bind to
+      default: system
+    - name: mas_appws_components
+      type: string
+      description: Manage components to configure in the workspace
+      default: "base=latest,health=latest"
+    - name: mas_app_settings_aio_flag
+      type: string
+      description: Flag indicating if Asset Investment Optimization (AIO) resource must be loaded or not. It can be loaded only when Optimizer application is installed.
+      default: ""
+    - name: mas_app_settings_demodata
+      type: string
+      description: Flag indicating if manage demodata should be loaded or not
+      default: ""
+    - name: mas_app_settings_base_lang
+      type: string
+      description: Defines Manage application base language
+      default: "EN"
+    - name: mas_app_settings_secondary_langs
+      type: string
+      description: Defines Manage application list of secondary languages
+      default: ""
+    - name: mas_app_settings_server_timezone
+      type: string
+      description: Defines Manage server timezone
+      default: ""
+    - name: mas_app_settings_persistent_volumes_flag
+      type: string
+      description: Flag indicating if persistent volumes should be configured by default during Manage Workspace activation. There are two defaulted File Storage Persistent Volumes Claim resources that will be created out of the box for Manage if this flag is set to true.
+      default: "False"
+    - name: mas_app_settings_jms_queue_pvc_storage_class
+      type: string
+      description: Storage Class for Manage JMS queues.
+      default: ""
+    - name: mas_app_settings_jms_queue_pvc_accessmode
+      type: string
+      description: Storage Access Mode for Manage JMS queues.
+      default: ""
+    - name: mas_app_settings_bim_pvc_storage_class
+      type: string
+      description: Storage Class for Manage BIM.
+      default: ""
+    - name: mas_app_settings_bim_pvc_accessmode
+      type: string
+      description: Storage Access Mode for Manage BIM.
+      default: ""
+    - name: mas_app_settings_doclinks_pvc_storage_class
+      type: string
+      description: Storage Class for Manage Doclinks.
+      default: ""
+    - name: mas_app_settings_doclinks_pvc_accessmode
+      type: string
+      description: Storage Access Mode for Manage Doclinks.
+      default: ""
+    - name: mas_app_settings_server_bundles_size
+      type: string
+      description: Provides different flavors of server bundle configuration to handle workload for Manage application.
+      default: "dev"
+    - name: is_full_manage
+      type: string
+      description: Set to true if full Manage is installed instead of Manage Foundation
+      default: "true"
+    - name: mas_app_settings_tablespace
+      type: string
+      description: Name of the Manage database tablespace
+      default: ""
+    - name: mas_app_settings_indexspace
+      type: string
+      description: Name of the Manage database indexspace
+      default: ""
+    - name: mas_app_settings_db2_schema
+      type: string
+      description: Name of the Manage database schema
+      default: ""
+    - name: mas_app_settings_customization_archive_name
+      type: string
+      description: Name of the Manage custom archive
+      default: ""
+    - name: mas_app_settings_customization_archive_url
+      type: string
+      description: URL of the Manage custom archive
+      default: ""
+    - name: mas_app_settings_customization_archive_username
+      type: string
+      description: Username to authenticate into Manage custom archive url (if required)
+      default: ""
+    - name: mas_app_settings_customization_archive_password
+      type: string
+      description: Password to authenticate into Manage custom archive url (if required)
+      default: ""
+    - name: mas_app_settings_crypto_key
+      type: string
+      description: Manage database encryption key for MXE_SECURITY_CRYPTO_KEY
+      default: ""
+    - name: mas_app_settings_cryptox_key
+      type: string
+      description: Manage database encryption key for MXE_SECURITY_CRYPTOX_KEY
+      default: ""
+    - name: mas_app_settings_old_crypto_key
+      type: string
+      description: Manage database encryption key for MXE_SECURITY_OLD_CRYPTO_KEY
+      default: ""
+    - name: mas_app_settings_old_cryptox_key
+      type: string
+      description: Manage database encryption key for MXE_SECURITY_OLD_CRYPTOX_KEY
+      default: ""
+    - name: mas_app_settings_override_encryption_secrets_flag
+      type: string
+      description: Defines if Manage database encryption secret should be overriden with new values provided
+      default: ""
+    - name: mas_app_settings_default_jms
+      type: string
+      description: Set true if you want to configure JMS queues. It is false by default.
+      default: "" # default is handled by ansible-devops
+    - name: mas_manage_attachment_configuration_mode
+      type: string
+      description: Manage attachment configuration mode (cr or db)
+      default: ""
+    - name: mas_manage_attachments_provider
+      type: string
+      description: Manage attachment provider (filestorage, ibm, aws)
+      default: ""
+    - name: cos_bucket_name # cos_bucket_name in attachments role
+      type: string
+      description: COS Bucket optionally used to hold attachments in Manage
+      default: ""
+
+    # MAS Application Configuration - IBM Maximo Location Services for ESRI
+    # -----------------------------------------------------------------------------
+    - name: install_arcgis
+      type: string
+      description: Flag to control whether to install IBM Maximo Location Services for ESRI
+      default: ""
+    - name: mas_arcgis_channel
+      type: string
+      description: Default channel for IBM Maximo Location Services for ESRI
+      default: "" # default is handled by ansible-devops
+
+    # MAS Application Configuration - Health Application
+    - name: mas_appws_bindings_health_wsl_flag
+      type: string
+      description: Boolean value indicating if Watson Studio must installed and bound to Manage/Health.
+      default: ""
+
+    # MAS Application Configuration - Optimizer Application
+    # -----------------------------------------------------------------------------
+    - name: mas_app_plan_optimizer
+      type: string
+      description: Configure install plan of Optimizer application (full or limited)
+      default: full
+
+    # MAS Application Configuration - Predict
+    # -----------------------------------------------------------------------------
+    - name: predict_deployment_size
+      type: string
+      description: controls the workload size of predict containers
+      default: "small"
+
+    # Dependencies - IBM Maximo AI Broker
+    # -----------------------------------------------------------------------------
+    # MAS Application Configuration - IBM Maximo AI Broker
+    # -----------------------------------------------------------------------------
+    # - name: mas_aibroker_channel
+    - name: mas_app_channel_aibroker
+      type: string
+      description: Default channel for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_storage_accesskey
+      type: string
+      description: S3/Minio storage access ket for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_storage_secretkey
+      type: string
+      description: S3/Minio storage secret key for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_storage_host
+      type: string
+      description: S3/Minio storage host for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_storage_region
+      type: string
+      description: S3/Minio storage region for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_storage_port
+      type: string
+      description: S3/Minio storage port for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_storage_ssl
+      type: string
+      description: S3/Minio storage ssl for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_storage_provider
+      type: string
+      description: S3/Minio storage provider IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_storage_pipelines_bucket
+      type: string
+      description: S3/Minio storage pipeline bucket for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_storage_tenants_bucket
+      type: string
+      description: S3/Minio storage tenants bucket for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_storage_templates_bucket
+      type: string
+      description: S3/Minio storage template bucket for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_tenant_name
+      type: string
+      description: Tenant name for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_watsonxai_apikey
+      type: string
+      description: WatsonX api key for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_watsonxai_url
+      type: string
+      description: WatsonX url for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_watsonxai_project_id
+      type: string
+      description: WatsonX project ID for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_watsonx_action
+      type: string
+      description: watsonx action for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_apikey_action
+      type: string
+      description: AI Broker api key action for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_s3_action
+      type: string
+      description: s3 action for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_connector_tag
+      type: string
+      description: connector image tag for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_controller_tag
+      type: string
+      description: controller image tag for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_pipeline_steps_tag
+      type: string
+      description: pipeline steps image tag for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_store_tag
+      type: string
+      description: store image tag for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_watcher_tag
+      type: string
+      description: watcher image tag for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_db_host
+      type: string
+      description: database host for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_db_port
+      type: string
+      description: database port for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_db_user
+      type: string
+      description: database user for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_db_database
+      type: string
+      description: database name for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_db_secret_name
+      type: string
+      description: database secret name for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_db_secret_key
+      type: string
+      description: database secret key for IBM Maximo AI Broker
+      default: ""
+    - name: mas_aibroker_db_secret_value
+      type: string
+      description: database secret value for IBM Maximo AI Broker
+      default: ""
+
+
+    # 3. Upgrade
+    # -------------------------------------------------------------------------
+    - name: skip_compatibility_check
+      type: string
+      default: "False"
+      description: Skip performing compatiblity checks before upgrade
+
+    - name: should_install_manage_foundation
+      type: string
+      description: Set to true if Manage Foundation is supposed to be installed (when upgrading to 9.1 from a 9.0 MAS without Manage)
+      default: "false"      
+
+  tasks:
+    # 1. Wait for approval & verify health of the cluster before we change anything
+    # -------------------------------------------------------------------------
+    - name: waitfor-approval
+      timeout: "0"
+      taskRef:
+        kind: Task
+        name: mas-devops-wait-for-configmap-v2
+      params:
+        - name: image_pull_policy
+          value: $(params.image_pull_policy)
+        - name: configmap_name
+          value: approval-upgrade
+
+    - name: pre-upgrade-check
+      timeout: "0"
+      taskRef:
+        kind: Task
+        name: mas-devops-ocp-verify-all
+      params:
+        # Controls the image pull policy for the ibmmas/cli image
+        - name: image_pull_policy
+          value: $(params.image_pull_policy)
+
+        # Pipeline Config
+        - name: skip_pre_check
+          value: $(params.skip_pre_check)
+        - name: devops_suite_name
+          value: pre-upgrade-check
+      when:
+        - input: "$(params.skip_pre_check)"
+          operator: notin
+          values: ["True", "true"]
+
+      runAfter:
+        - waitfor-approval
+
+
+    # 2. Suite Upgrade (Phase 1)
+    # -------------------------------------------------------------------------
+    - name: core-upgrade
+      timeout: "0"
+      taskRef:
+        kind: Task
+        name: mas-devops-suite-upgrade
+      runAfter:
+        - pre-upgrade-check
+      params:
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: mas_channel
+          value: $(params.mas_channel)
+        - name: skip_compatibility_check
+          value: $(params.skip_compatibility_check)
         - name: devops_suite_name
           value: core-upgrade
 
@@ -27641,52 +28893,528 @@ spec:
       runAfter:
         - core-upgrade
 
+    # 3. Install Universal Dependencies (Phase 2)
+    # 3.1 Db2
+    # 3.1.1 System Db2
+                        
+    - name: db2-system
+      params:
+      - name: image_pull_policy
+        value: $(params.image_pull_policy)
+      - name: devops_suite_name
+        value: dependencies-db2-system
+      - name: mas_instance_id
+        value: $(params.mas_instance_id)
+      - name: ibm_entitlement_key
+        value: $(params.ibm_entitlement_key)
+      - name: db2_channel
+        value: $(params.db2_channel)
+      - name: db2_instance_name
+        value: mas-$(params.mas_instance_id)-system
+      - name: db2_namespace
+        value: $(params.db2_namespace)
+      - name: db2_dbname
+        value: $(params.db2_dbname)
+      - name: db2_version
+        value: $(params.db2_version)
+      - name: db2_workload
+        value: $(params.db2_workload)
+      - name: db2_4k_device_support
+        value: $(params.db2_4k_device_support)
+      - name: db2_table_org
+        value: $(params.db2_table_org)
+      - name: db2_affinity_key
+        value: $(params.db2_affinity_key)
+      - name: db2_affinity_value
+        value: $(params.db2_affinity_value)
+      - name: db2_tolerate_key
+        value: $(params.db2_tolerate_key)
+      - name: db2_tolerate_value
+        value: $(params.db2_tolerate_value)
+      - name: db2_tolerate_effect
+        value: $(params.db2_tolerate_effect)
+      - name: db2_cpu_requests
+        value: $(params.db2_cpu_requests)
+      - name: db2_cpu_limits
+        value: $(params.db2_cpu_limits)
+      - name: db2_memory_requests
+        value: $(params.db2_memory_requests)
+      - name: db2_memory_limits
+        value: $(params.db2_memory_limits)
+      - name: db2_meta_storage_size
+        value: $(params.db2_meta_storage_size)
+      - name: db2_backup_storage_size
+        value: $(params.db2_backup_storage_size)
+      - name: db2_logs_storage_size
+        value: $(params.db2_logs_storage_size)
+      - name: db2_temp_storage_size
+        value: $(params.db2_temp_storage_size)
+      - name: db2_data_storage_size
+        value: $(params.db2_data_storage_size)
+      - name: db2_meta_storage_class
+        value: $(params.storage_class_rwx)
+      - name: db2_data_storage_class
+        value: $(params.storage_class_rwo)
+      - name: db2_backup_storage_class
+        value: $(params.storage_class_rwx)
+      - name: db2_logs_storage_class
+        value: $(params.storage_class_rwo)
+      - name: db2_temp_storage_class
+        value: $(params.storage_class_rwo)
+      - name: db2_meta_storage_accessmode
+        value: $(params.db2_meta_storage_accessmode)
+      - name: db2_backup_storage_accessmode
+        value: $(params.db2_backup_storage_accessmode)
+      - name: db2_temp_storage_accessmode
+        value: $(params.db2_temp_storage_accessmode)
+      - name: db2_logs_storage_accessmode
+        value: $(params.db2_logs_storage_accessmode)
+      - name: db2_data_storage_accessmode
+        value: $(params.db2_data_storage_accessmode)
+      - name: mas_config_scope
+        value: system
+      - name: custom_labels
+        value: $(params.custom_labels)
+      runAfter:
+      - core-verify
+      taskRef:
+        kind: Task
+        name: mas-devops-db2
+      timeout: '0'
+      when:
+      - input: $(params.db2_action_system)
+        operator: in
+        values:
+        - install
+      - input: $(params.should_install_manage_foundation)
+        operator: in
+        values:
+        - 'true'
+      workspaces:
+      - name: configs
+        workspace: shared-configs
+    
+
+    # 3.1.2 Dedicated Manage Db2
+                        
+    - name: db2-manage
+      params:
+      - name: image_pull_policy
+        value: $(params.image_pull_policy)
+      - name: devops_suite_name
+        value: dependencies-db2-manage
+      - name: mas_instance_id
+        value: $(params.mas_instance_id)
+      - name: ibm_entitlement_key
+        value: $(params.ibm_entitlement_key)
+      - name: db2_channel
+        value: $(params.db2_channel)
+      - name: db2_instance_name
+        value: mas-$(params.mas_instance_id)-$(params.mas_workspace_id)-manage
+      - name: db2_ldap_username
+        value: $(params.db2_ldap_username)
+      - name: db2_ldap_password
+        value: $(params.db2_ldap_password)
+      - name: db2_type
+        value: $(params.db2_type)
+      - name: db2_timezone
+        value: $(params.db2_timezone)
+      - name: db2_namespace
+        value: $(params.db2_namespace)
+      - name: db2_dbname
+        value: $(params.db2_dbname)
+      - name: db2_version
+        value: $(params.db2_version)
+      - name: db2_workload
+        value: $(params.db2_workload)
+      - name: db2_4k_device_support
+        value: $(params.db2_4k_device_support)
+      - name: db2_table_org
+        value: $(params.db2_table_org)
+      - name: db2_affinity_key
+        value: $(params.db2_affinity_key)
+      - name: db2_affinity_value
+        value: $(params.db2_affinity_value)
+      - name: db2_tolerate_key
+        value: $(params.db2_tolerate_key)
+      - name: db2_tolerate_value
+        value: $(params.db2_tolerate_value)
+      - name: db2_tolerate_effect
+        value: $(params.db2_tolerate_effect)
+      - name: db2_cpu_requests
+        value: $(params.db2_cpu_requests)
+      - name: db2_cpu_limits
+        value: $(params.db2_cpu_limits)
+      - name: db2_memory_requests
+        value: $(params.db2_memory_requests)
+      - name: db2_memory_limits
+        value: $(params.db2_memory_limits)
+      - name: db2_meta_storage_size
+        value: $(params.db2_meta_storage_size)
+      - name: db2_backup_storage_size
+        value: $(params.db2_backup_storage_size)
+      - name: db2_logs_storage_size
+        value: $(params.db2_logs_storage_size)
+      - name: db2_temp_storage_size
+        value: $(params.db2_temp_storage_size)
+      - name: db2_data_storage_size
+        value: $(params.db2_data_storage_size)
+      - name: db2_meta_storage_class
+        value: $(params.storage_class_rwx)
+      - name: db2_data_storage_class
+        value: $(params.storage_class_rwo)
+      - name: db2_backup_storage_class
+        value: $(params.storage_class_rwx)
+      - name: db2_logs_storage_class
+        value: $(params.storage_class_rwo)
+      - name: db2_temp_storage_class
+        value: $(params.storage_class_rwo)
+      - name: db2_meta_storage_accessmode
+        value: $(params.db2_meta_storage_accessmode)
+      - name: db2_backup_storage_accessmode
+        value: $(params.db2_backup_storage_accessmode)
+      - name: db2_temp_storage_accessmode
+        value: $(params.db2_temp_storage_accessmode)
+      - name: db2_logs_storage_accessmode
+        value: $(params.db2_logs_storage_accessmode)
+      - name: db2_data_storage_accessmode
+        value: $(params.db2_data_storage_accessmode)
+      - name: mas_config_scope
+        value: wsapp
+      - name: mas_workspace_id
+        value: $(params.mas_workspace_id)
+      - name: mas_application_id
+        value: manage
+      - name: custom_labels
+        value: $(params.custom_labels)
+      runAfter:
+      - db2-system
+      taskRef:
+        kind: Task
+        name: mas-devops-db2
+      timeout: '0'
+      when:
+      - input: $(params.db2_action_manage)
+        operator: in
+        values:
+        - install
+      - input: $(params.should_install_manage_foundation)
+        operator: in
+        values:
+        - 'true'
+      workspaces:
+      - name: configs
+        workspace: shared-configs
+    
+
+    # 3.1.3 Configure Db2 in MAS
+                        
+    - name: suite-config-db2
+      params:
+      - name: image_pull_policy
+        value: $(params.image_pull_policy)
+      - name: devops_suite_name
+        value: suite-config-db2
+      - name: mas_instance_id
+        value: $(params.mas_instance_id)
+      runAfter:
+      - db2-manage
+      taskRef:
+        kind: Task
+        name: mas-devops-suite-config
+      timeout: '0'
+      when:
+      - input: $(params.mas_app_channel_iot)$(params.mas_app_channel_manage)
+        operator: notin
+        values:
+        - ''
+      - input: $(params.should_install_manage_foundation)
+        operator: in
+        values:
+        - 'true'
+      workspaces:
+      - name: configs
+        workspace: shared-configs
+    
 
-    # 3. IoT Upgrade (Phase 2)
+    # 4. Install & Configure Manage (Phase 3)
     # -------------------------------------------------------------------------
-    - name: app-iot-upgrade
+    # 4.1. Prepare database for Maxinst
+                        
+    - name: suite-db2-setup-system
+      params:
+      - name: image_pull_policy
+        value: $(params.image_pull_policy)
+      - name: devops_suite_name
+        value: suite-db2-setup-system
+      - name: db2_instance_name
+        value: mas-$(params.mas_instance_id)-system
+      - name: db2_namespace
+        value: $(params.db2_namespace)
+      runAfter:
+      - suite-config-db2
+      taskRef:
+        kind: Task
+        name: mas-devops-suite-db2-setup-for-manage
+      timeout: '0'
+      when:
+      - input: $(params.mas_app_channel_manage)
+        operator: notin
+        values:
+        - ''
+      - input: $(params.db2_action_system)
+        operator: in
+        values:
+        - install
+      - input: $(params.db2_action_manage)
+        operator: notin
+        values:
+        - install
+        - byo
+      - input: $(params.should_install_manage_foundation)
+        operator: in
+        values:
+        - 'true'
+    
+
+                        
+    - name: suite-db2-setup-manage
+      params:
+      - name: image_pull_policy
+        value: $(params.image_pull_policy)
+      - name: devops_suite_name
+        value: suite-db2-setup-manage
+      - name: db2_instance_name
+        value: mas-$(params.mas_instance_id)-$(params.mas_workspace_id)-manage
+      - name: db2_namespace
+        value: $(params.db2_namespace)
+      runAfter:
+      - suite-config-db2
+      taskRef:
+        kind: Task
+        name: mas-devops-suite-db2-setup-for-manage
+      timeout: '0'
+      when:
+      - input: $(params.mas_app_channel_manage)
+        operator: notin
+        values:
+        - ''
+      - input: $(params.db2_action_manage)
+        operator: in
+        values:
+        - install
+      - input: $(params.should_install_manage_foundation)
+        operator: in
+        values:
+        - 'true'
+    
+
+    # 4.2 Manage Install
+                        
+    - name: app-install-manage
+      params:
+      - name: image_pull_policy
+        value: $(params.image_pull_policy)
+      - name: devops_suite_name
+        value: app-manage-install
+      - name: mas_instance_id
+        value: $(params.mas_instance_id)
+      - name: mas_app_id
+        value: manage
+      - name: artifactory_username
+        value: $(params.artifactory_username)
+      - name: artifactory_token
+        value: $(params.artifactory_token)
+      - name: mas_app_channel
+        value: $(params.mas_app_channel_manage)
+      - name: ibm_entitlement_key
+        value: $(params.ibm_entitlement_key)
+      - name: custom_labels
+        value: $(params.custom_labels)
+      runAfter:
+      - suite-db2-setup-system
+      - suite-db2-setup-manage
+      taskRef:
+        kind: Task
+        name: mas-devops-suite-app-install
+      timeout: '0'
+      when:
+      - input: $(params.mas_app_channel_manage)
+        operator: notin
+        values:
+        - ''
+      - input: $(params.should_install_manage_foundation)
+        operator: in
+        values:
+        - 'true'
+      workspaces:
+      - name: pod-templates
+        workspace: shared-pod-templates
+    
+
+    # 4.3 Configure Manage workspace
+                        
+    - name: app-cfg-manage
+      params:
+      - name: image_pull_policy
+        value: $(params.image_pull_policy)
+      - name: devops_suite_name
+        value: app-manage-cfg
+      - name: mas_instance_id
+        value: $(params.mas_instance_id)
+      - name: mas_app_id
+        value: manage
+      - name: mas_workspace_id
+        value: $(params.mas_workspace_id)
+      - name: mas_appws_components
+        value: $(params.mas_appws_components)
+      - name: mas_appws_bindings_jdbc
+        value: $(params.mas_appws_bindings_jdbc_manage)
+      - name: mas_appws_bindings_health_wsl_flag
+        value: $(params.mas_appws_bindings_health_wsl_flag)
+      - name: mas_app_settings_aio_flag
+        value: $(params.mas_app_settings_aio_flag)
+      - name: mas_app_settings_demodata
+        value: $(params.mas_app_settings_demodata)
+      - name: mas_app_settings_base_lang
+        value: $(params.mas_app_settings_base_lang)
+      - name: mas_app_settings_secondary_langs
+        value: $(params.mas_app_settings_secondary_langs)
+      - name: mas_app_settings_server_timezone
+        value: $(params.mas_app_settings_server_timezone)
+      - name: mas_app_settings_persistent_volumes_flag
+        value: $(params.mas_app_settings_persistent_volumes_flag)
+      - name: mas_app_settings_jms_queue_pvc_storage_class
+        value: $(params.mas_app_settings_jms_queue_pvc_storage_class)
+      - name: mas_app_settings_jms_queue_pvc_accessmode
+        value: $(params.mas_app_settings_jms_queue_pvc_accessmode)
+      - name: mas_app_settings_bim_pvc_storage_class
+        value: $(params.mas_app_settings_bim_pvc_storage_class)
+      - name: mas_app_settings_bim_pvc_accessmode
+        value: $(params.mas_app_settings_bim_pvc_accessmode)
+      - name: mas_app_settings_doclinks_pvc_storage_class
+        value: $(params.mas_app_settings_doclinks_pvc_storage_class)
+      - name: mas_app_settings_doclinks_pvc_accessmode
+        value: $(params.mas_app_settings_doclinks_pvc_accessmode)
+      - name: mas_app_settings_server_bundles_size
+        value: $(params.mas_app_settings_server_bundles_size)
+      - name: is_full_manage
+        value: $(params.is_full_manage)
+      - name: mas_app_settings_tablespace
+        value: $(params.mas_app_settings_tablespace)
+      - name: mas_app_settings_indexspace
+        value: $(params.mas_app_settings_indexspace)
+      - name: mas_app_settings_db2_schema
+        value: $(params.mas_app_settings_db2_schema)
+      - name: mas_app_settings_customization_archive_url
+        value: $(params.mas_app_settings_customization_archive_url)
+      - name: mas_app_settings_customization_archive_name
+        value: $(params.mas_app_settings_customization_archive_name)
+      - name: mas_app_settings_customization_archive_username
+        value: $(params.mas_app_settings_customization_archive_username)
+      - name: mas_app_settings_customization_archive_password
+        value: $(params.mas_app_settings_customization_archive_password)
+      - name: mas_app_settings_crypto_key
+        value: $(params.mas_app_settings_crypto_key)
+      - name: mas_app_settings_cryptox_key
+        value: $(params.mas_app_settings_cryptox_key)
+      - name: mas_app_settings_old_crypto_key
+        value: $(params.mas_app_settings_old_crypto_key)
+      - name: mas_app_settings_old_cryptox_key
+        value: $(params.mas_app_settings_old_cryptox_key)
+      - name: mas_app_settings_override_encryption_secrets_flag
+        value: $(params.mas_app_settings_override_encryption_secrets_flag)
+      - name: mas_app_settings_default_jms
+        value: $(params.mas_app_settings_default_jms)
+      - name: mas_manage_attachment_configuration_mode
+        value: $(params.mas_manage_attachment_configuration_mode)
+      - name: mas_manage_attachments_provider
+        value: $(params.mas_manage_attachments_provider)
+      - name: db2_namespace
+        value: $(params.db2_namespace)
+      - name: ibmcloud_resourcegroup
+        value: $(params.ibmcloud_resourcegroup)
+      - name: ibmcloud_apikey
+        value: $(params.ibmcloud_apikey)
+      - name: cos_resourcegroup
+        value: $(params.cos_resourcegroup)
+      - name: cos_apikey
+        value: $(params.cos_apikey)
+      - name: cos_instance_name
+        value: $(params.cos_instance_name)
+      - name: cos_bucket_name
+        value: $(params.cos_bucket_name)
+      - name: custom_labels
+        value: $(params.custom_labels)
+      runAfter:
+      - app-install-manage
+      taskRef:
+        kind: Task
+        name: mas-devops-suite-app-config
+      timeout: '0'
+      when:
+      - input: $(params.mas_app_channel_manage)
+        operator: notin
+        values:
+        - ''
+      - input: $(params.should_install_manage_foundation)
+        operator: in
+        values:
+        - 'true'
+      workspaces:
+      - name: configs
+        workspace: shared-configs
+      - name: pod-templates
+        workspace: shared-pod-templates
+    
+
+    # 5. Manage Upgrade (Phase 4)
+    # -------------------------------------------------------------------------
+    - name: app-manage-upgrade
       timeout: "0"
       params:
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: iot
+          value: manage
         - name: mas_app_channel
-          value: $(params.mas_app_channel_iot)
+          value: $(params.mas_app_channel_manage)
         - name: skip_compatibility_check
           value: $(params.skip_compatibility_check)
         - name: devops_suite_name
-          value: app-iot-upgrade
+          value: app-manage-upgrade
       taskRef:
         kind: Task
         name: mas-devops-suite-app-upgrade
       runAfter:
-        - core-verify
-
+        - app-cfg-manage
+      when:
+        - input: "$(params.should_install_manage_foundation)"
+          operator: notin
+          values: ["true"]
 
-    # 4. Manage Upgrade (Phase 2)
+    # 6. IoT Upgrade (Phase 5 - after Manage)
     # -------------------------------------------------------------------------
-    - name: app-manage-upgrade
+    - name: app-iot-upgrade
       timeout: "0"
       params:
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: manage
+          value: iot
         - name: mas_app_channel
-          value: $(params.mas_app_channel_manage)
+          value: $(params.mas_app_channel_iot)
         - name: skip_compatibility_check
           value: $(params.skip_compatibility_check)
         - name: devops_suite_name
-          value: app-manage-upgrade
+          value: app-iot-upgrade
       taskRef:
         kind: Task
         name: mas-devops-suite-app-upgrade
       runAfter:
-        - core-verify
-
+        - app-manage-upgrade
 
-    # 5. Visual Inspection Upgrade (Phase 2)
+    # 7. Visual Inspection Upgrade (Phase 5 - after Manage)
     # -------------------------------------------------------------------------
     - name: app-visualinspection-upgrade
       timeout: "0"
@@ -27705,10 +29433,10 @@ spec:
         kind: Task
         name: mas-devops-suite-app-upgrade
       runAfter:
-        - core-verify
+        - app-manage-upgrade
 
 
-    # 6. Assist Upgrade (Phase 2)
+    # 8. Assist Upgrade (Phase 5 - after Manage)
     # -------------------------------------------------------------------------
     - name: app-assist-upgrade
       timeout: "0"
@@ -27727,10 +29455,10 @@ spec:
         kind: Task
         name: mas-devops-suite-app-upgrade
       runAfter:
-        - core-verify
+        - app-manage-upgrade
 
 
-    # 7. Optimizer Upgrade (Phase 2)
+    # 9. Optimizer Upgrade (Phase 5 - after Manage)
     # -------------------------------------------------------------------------
     - name: app-optimizer-upgrade
       timeout: "0"
@@ -27749,54 +29477,51 @@ spec:
         kind: Task
         name: mas-devops-suite-app-upgrade
       runAfter:
-        - core-verify
-
+        - app-manage-upgrade
 
-    # 8. Monitor Upgrade (Phase 3 - after IoT)
+    # 10. Predict Upgrade (Phase 5 - after Manage)
     # -------------------------------------------------------------------------
-    - name: app-monitor-upgrade
+    - name: app-predict-upgrade
       timeout: "0"
       params:
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: monitor
+          value: predict
         - name: mas_app_channel
-          value: $(params.mas_app_channel_monitor)
+          value: $(params.mas_app_channel_predict)
         - name: skip_compatibility_check
           value: $(params.skip_compatibility_check)
         - name: devops_suite_name
-          value: app-monitor-upgrade
+          value: app-predict-upgrade
       taskRef:
         kind: Task
         name: mas-devops-suite-app-upgrade
       runAfter:
-        - app-iot-upgrade
-
+        - app-manage-upgrade
 
-    # 9. Predict Upgrade (Phase 3 - after Manage)
+    # 11. Monitor Upgrade (Phase 6 - after IoT)
     # -------------------------------------------------------------------------
-    - name: app-predict-upgrade
+    - name: app-monitor-upgrade
       timeout: "0"
       params:
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: predict
+          value: monitor
         - name: mas_app_channel
-          value: $(params.mas_app_channel_predict)
+          value: $(params.mas_app_channel_monitor)
         - name: skip_compatibility_check
           value: $(params.skip_compatibility_check)
         - name: devops_suite_name
-          value: app-predict-upgrade
+          value: app-monitor-upgrade
       taskRef:
         kind: Task
         name: mas-devops-suite-app-upgrade
       runAfter:
-        - app-manage-upgrade
-
+        - app-iot-upgrade
 
-    # 10. Verify health of the cluster after upgrade
+    # 12. Verify health of the cluster after upgrade
     # -------------------------------------------------------------------------
     - name: post-upgrade-verify
       timeout: "0"
@@ -27819,12 +29544,12 @@ spec:
           values: ["True", "true"]
 
       runAfter:
-        # Phase 2 apps that don't have a phase 3 app following it
+        # Phase 5 apps that don't have a phase 6 app following it
         - app-assist-upgrade
         - app-optimizer-upgrade
         - app-visualinspection-upgrade
-        # Phase 3 apps
         - app-predict-upgrade
+        # Phase 6 apps
         - app-monitor-upgrade
 
   finally: