[patch] Support Attachments

.github/workflows/build-cli.yml

@@ -181,8 +181,8 @@ jobs:
           if [[ -e $GITHUB_WORKSPACE/image/cli/install/ibm-mas_devops.tar.gz ]]; then
             echo "Found a local Ansible collection to be used in $GITHUB_WORKSPACE/image/cli/install/ibm-mas_devops.tar.gz! Skip download from Artifactory..."
           else
-            echo "Downloading from ***/ibm-mas/ansible-devops/latest/ibm-mas_devops-latest.tar.gz"
-            wget --header="Authorization:Bearer $ARTIFACTORY_TOKEN" $ARTIFACTORY_GENERIC_RELEASE_URL/ibm-mas/ansible-devops/latest/ibm-mas_devops-latest.tar.gz -O $GITHUB_WORKSPACE/image/cli/install/ibm-mas_devops.tar.gz
+            echo "Downloading from ***/ibm-mas/ansible-devops/25.0.0-pre.maxmof-827/ibm-mas_devops-25.0.0-pre.maxmof-827.tar.gz"
+            wget --header="Authorization:Bearer $ARTIFACTORY_TOKEN" $ARTIFACTORY_GENERIC_RELEASE_URL/ibm-mas/ansible-devops/25.0.0-pre.maxmof-827/ibm-mas_devops-25.0.0-pre.maxmof-827.tar.gz -O $GITHUB_WORKSPACE/image/cli/install/ibm-mas_devops.tar.gz
           fi
 
       # 3. Download Built Artifacts

python/src/mas/cli/install/argBuilder.py

@@ -212,6 +212,12 @@ def buildCommand(self) -> str:
             if self.getParam('mas_app_settings_server_timezone') != "":
                 command += f"  --manage-server-timezone \"{self.getParam('mas_app_settings_server_timezone')}\"{newline}"
 
+            if self.getParam('mas_manage_attachments_provider') != "":
+                command += f"  --mas-manage-attachments-provider \"{self.getParam('mas_manage_attachments_provider')}\"{newline}"
+
+            if self.getParam('mas_manage_attachment_configuration_mode') != "":
+                command += f"  --mas-manage-attachment-configuration-mode \"{self.getParam('mas_manage_attachment_configuration_mode')}\"{newline}"
+
         # IBM Cloud Pak for Data
         # -----------------------------------------------------------------------------
         if self.getParam('cpd_product_version') != "":

python/src/mas/cli/install/argParser.py

@@ -519,7 +519,7 @@ def isValidFile(parser, arg) -> str:
     "--manage-jms",
     dest="mas_app_settings_default_jms",
     required=False,
-    help="",
+    help="Set JMS configuration",
     action="store_const",
     const="true"
 )
@@ -651,6 +651,21 @@ def isValidFile(parser, arg) -> str:
     help="Manage server timezone. Default is `GMT`"
 )
 
+# Manage Attachments
+# -----------------------------------------------------------------------------
+manageArgGroup.add_argument(
+    "--mas-manage-attachments-provider",
+    dest="mas_manage_attachments_provider",
+    required=False,
+    help="Defines the storage provider type to be used to store Manage application's attachments."
+)
+manageArgGroup.add_argument(
+    "--mas-manage-attachment-configuration-mode",
+    dest="mas_manage_attachment_configuration_mode",
+    required=False,
+    help="Defines how attachment properties will be configured in Manage. Possible values are: cr and db"
+)
+
 # IBM Cloud Pak for Data
 # -----------------------------------------------------------------------------
 cpdAppsArgGroup = installArgParser.add_argument_group("IBM Cloud Pak for Data")
@@ -906,7 +921,7 @@ def isValidFile(parser, arg) -> str:
 )
 
 # COS
-# -----------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 cosArgGroup = installArgParser.add_argument_group("Cloud Object Storage")
 cosArgGroup.add_argument(
     "--cos",

python/src/mas/cli/install/params.py

@@ -115,6 +115,9 @@
     "cos_type",
     "cos_resourcegroup",
     "cos_apikey",
+    # Attachments
+    "mas_manage_attachments_provider",
+    "mas_manage_attachment_configuration_mode",
     # ECK
     "eck_action",
     "eck_enable_logstash",

tekton/src/tasks/ivt/ivt-manage.yml.j2

@@ -73,6 +73,13 @@ spec:
       type: string
       description: FVT Digest - Shared Test Container
       default: ""
+
+    # Test-specific Information (all optional)
+    # -------------------------------------------------------------------------
+    - name: artifactory_token
+      type: string
+      description: Artifactory API Key (required by fvt-ibm-mas-manage to upload test framework logs)
+      default: ""
 
   stepTemplate:
     name: 'ivt-manage'
@@ -112,6 +119,20 @@ spec:
             optional: true
       - name: IBMADMIN_ENABLED
         value: "true"
+
+      # If this secret exists (with both ARTIFACTORY_TOKEN and ARTIFACTORY_UPLOAD_DIR keys set) Maximo Automation Framework logs will be automatically uploaded
+      - name: ARTIFACTORY_TOKEN
+        valueFrom:
+          secretKeyRef:
+            name: mas-devops
+            key: ARTIFACTORY_TOKEN
+            optional: true
+      - name: ARTIFACTORY_UPLOAD_DIR
+        valueFrom:
+          secretKeyRef:
+            name: mas-devops
+            key: ARTIFACTORY_UPLOAD_DIR
+            optional: true
 
   volumes:
     - name: dshm