add mvi

Author: Benjamin Xue

9.0.x/mas-deploy-pipeline-run.yml

@@ -14,29 +14,40 @@ spec:
       value: "TechZone"
     - name: uds-lastname
       value: "Developer"
+    - name: use-letsencrypt-certs
+      value: "false"
+    - name: ibm-entitlement-key
+      value: "false"
+    #mas-license-secret
+    - name: license-file-secret-name
+      value: "false"
     # Optionally change storageclass for ocpv
-    - name: rwx-storageclass
-      value: ocs-external-storagecluster-cephfs
-    - name: rwo-storageclass
-      value: ocs-external-storagecluster-cephfs
+    # - name: rwx-storageclass
+    #   value: ocs-external-storagecluster-cephfs
+    # - name: rwo-storageclass
+    #   value: ocs-external-storagecluster-cephfs
 
     # install MAS Core. This task may be skipped once done successfully
     - name: mas-install-core
-      value: "true"
+      value: "false"
 
     # install MAS Manage, depending on MAS Core, optionally CP4D/DB2
     - name: mas-install-manage
-      value: "true"
+      value: "false"
     - name: mas-install-demo-data
       value: "true"
     - name: mas-cp4d-install-cognos
       value: "false"
 
+    # install MAS Visual Inspection
+    - name: mas-install-visualinspection
+      value: "false"
+
     # install MAS IoT and Monitor, depending on MAS Core
     - name: mas-install-iot
-      value: "true"
+      value: "false"
     - name: mas-install-monitor
-      value: "true"
+      value: "false"
 
     # install MAS Predict, depending on MAS Core, Health, IoT and Monitor, optionally CP4D services
     - name: mas-install-predict

9.0.x/mas-devops-deploy.yml

@@ -29,6 +29,9 @@ spec:
     - name: mas-cp4d-install-cognos
       type: string
       default: "false"
+    - name: mas-install-visualinspection
+      type: string
+      default: "false"
     - name: mas-install-iot
       type: string
       description: "install MAS iot"
@@ -83,9 +86,9 @@ spec:
       type: string
       default: ocs-storagecluster-cephfs
     - name: "mas-catalog-version"
-      description: "Maximo operator catalog version, e.g. v9-240730-amd64"
+      description: "Maximo operator catalog version. Check https://ibm-mas.github.io/cli/catalogs/"
       type: string
-      default: "v9-240827-amd64"
+      default: v9-241003-amd64
     - name: mas-channel
       description: "channel to subscribe to"
       type: string
@@ -999,6 +1002,74 @@ spec:
               export CPD_SERVICE_BLOCK_STORAGE_CLASS=$(params.rwo-storageclass)
 
               ansible-playbook ibm.mas_devops.oneclick_add_manage
+
+    - name: install-visualinspection
+      when:
+        - input: "$(params.mas-install-visualinspection)"
+          operator: in
+          values: ["true"]
+      retries: 3
+      timeout: "12h"
+      runAfter:
+        - install-mas-core
+      workspaces:
+        - name: ws
+      params:
+        - name: mas-catalog-version
+          value: "$(params.mas-catalog-version)"
+        - name: mas-channel
+          value: "$(params.mas-channel)"
+        - name: mas-instance-id
+          value: "$(params.mas-instance-id)"
+        - name: mas-workspace-id
+          value: "$(params.mas-workspace-id)"    
+        - name: rwx-storageclass
+          value: "$(params.rwx-storageclass)"
+        - name: rwo-storageclass
+          value: "$(params.rwo-storageclass)"
+        - name: uds-email
+          value: "$(params.uds-email)"
+        - name: uds-firstname
+          value: "$(params.uds-firstname)"
+        - name: uds-lastname
+          value: "$(params.uds-lastname)"
+      taskSpec:
+        workspaces:
+          - name: ws
+        params:
+          - name: mas-instance-id
+          - name: mas-workspace-id
+          - name: mas-catalog-version
+          - name: mas-channel
+          - name: rwx-storageclass
+          - name: rwo-storageclass
+          - name: uds-email
+          - name: uds-firstname
+          - name: uds-lastname
+        steps:
+          - name: run-mas-cli
+            image: quay.io/ibmmas/cli:latest
+            script: |
+              #!/usr/bin/env bash
+              export MAS_INSTANCE_ID=$(params.mas-instance-id)
+              export MAS_WORKSPACE_ID=$(params.mas-workspace-id)
+              export MAS_CONFIG_DIR=$(workspaces.ws.path)/masconfig
+              export IBM_ENTITLEMENT_KEY=$(cat $(workspaces.ws.path)/ek.dat)
+              export MAS_ENTITLEMENT_KEY=$(cat $(workspaces.ws.path)/ek.dat)
+              export MAS_CONFIG_SCOPE=wsapp
+              export MAS_APPWS_BINDINGS_JDBC=workspace-application
+              export MAS_CATALOG_VERSION=$(params.mas-catalog-version)
+              export MAS_CHANNEL=$(params.mas-channel)
+
+              export DRO_CONTACT_EMAIL=$(params.uds-email)
+              export DRO_CONTACT_FIRSTNAME=$(params.uds-firstname)
+              export DRO_CONTACT_LASTNAME=$(params.uds-lastname)
+              export DRO_NAMESPACE=ibm-dro
+              
+              export GPU_DRIVER_VERSION=565.57.01
+
+              ansible-playbook ibm.mas_devops.oneclick_add_visualinspection
+
     - name: install-iot
       when:
         - input: "$(params.mas-install-iot)"