Merge branch 'v2.x/staging' into user/markackert/staging-to-2.14.0

zowe · Jan 9, 2024 · 2a9da35 · 2a9da35
2 parents c389faf + ca1841e
commit 2a9da35
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/bin/libs/component.sh b/bin/libs/component.sh
@@ -551,6 +551,10 @@ zis_plugin_install() {
 
   if [ $changed -eq 1 ]; then
     copy_to_data_set "$parmlib_member_as_unix_file" "$zwes_zis_parmlib($zwes_zis_parmlib_member)" "" "true"
+    if [ $? != 0 ]; then
+      print_error "Error ZWEL0200E: Failed to copy USS file ${parmlib_member_as_unix_file} to MVS data set ${zwes_zis_parmlib}."
+      return 200
+    fi
   fi
 }
 

diff --git a/bin/libs/component.ts b/bin/libs/component.ts
@@ -672,7 +672,11 @@ export function zisPluginInstall(pluginPath: string, zisPluginlib: string, zisPa
   if (changed) {
     common.printDebug(`Parmlib modified, writing as \n${parmlibContents}`);
     xplatform.storeFileUTF8(parmlibMemberAsUnixFile, xplatform.AUTO_DETECT, parmlibContents);
-    zosdataset.copyToDataset(parmlibMemberAsUnixFile, `${zisParmlib}(${zisParmlibMember})`, "", true);
+    const rc = zosdataset.copyToDataset(parmlibMemberAsUnixFile, `${zisParmlib}(${zisParmlibMember})`, "", true);
+    if (rc != 0) {
+      common.printError(`Error ZWEL0200E: Failed to copy USS file ${parmlibMemberAsUnixFile} to MVS data set ${zisParmlib}.`);
+      return 200;
+    }
   }
   return 0;
 }

diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json
@@ -861,11 +861,25 @@
           "properties": {
             "network": {
               "$ref": "#/$defs/networkSettings"
+            },
+            "job": {
+              "$ref": "#/$defs/componentJobSettings"
             }
           }
         }
       }
     },
+    "componentJobSettings": {
+      "$anchor": "componentJobSettings",
+      "type": "object",
+      "description": "Component level overrides for job execution behavior",
+      "properties": {
+        "suffix": {
+          "type": "string",
+          "description": "Can be used by components to declare a jobname suffix to append to their job. This is not currently used by Zowe itself, it is up to components to use this value if desired. Zowe may use this value in the future."
+        }
+      }
+    },
     "tlsSettings": {
      "$anchor": "tlsSettings",
       "type": "object",