Merge branch 'v2.x/staging' into bugfix/v2/enabled-components-ha

.github/scripts/cicd_test/make_matrix.sh

@@ -83,7 +83,7 @@ if [[ ! -z "$test_force_system" ]]; then
 else
   if [[ -z "$dont_parse_test_server" ]]; then
     if [[ "$test_server" == "Any zzow servers" ]]; then
-      test_server="zzow0"$(echo $(($RANDOM % 3 + 2)))
+      test_server="zzow0"$(echo $(($RANDOM % 3 + 6)))
     fi
     TEST_FILE_SERVER="$test_file($test_server)"
   else

.github/workflows/build-packaging.yml

@@ -171,7 +171,7 @@ jobs:
         with:
           manifest-file-path: ${{ github.workspace }}/manifest.json
           default-target-path: .pax/binaryDependencies/
-          expected-count: 29
+          expected-count: 30
 
       # this step is not doing a publish, we are just utilizing this actions to get the PUBLISH_TARGET_PATH, 
       # and it will be used in the next step: [Download 3] Download SMPE build log

.pax/pre-packaging.sh

@@ -249,6 +249,13 @@ mv ./content/templates .
 chmod +x templates/*.rex
 
 mkdir -p "${ZOWE_ROOT_DIR}/bin/utils"
+getesm=$(find "${ZOWE_ROOT_DIR}/files" -type f \( -name "getesm*.pax" \) | head -n 1)
+echo "[$SCRIPT_NAME] extract getesm $getesm"
+cd "${ZOWE_ROOT_DIR}/bin/utils"
+pax -ppx -rf "${getesm}"
+rm "${getesm}"
+cd "${BASE_DIR}"
+
 configmgr=$(find "${ZOWE_ROOT_DIR}/files" -type f \( -name "configmgr-2*.pax" \) | head -n 1)
 echo "[$SCRIPT_NAME] extract configmgr $configmgr"
 cd "${ZOWE_ROOT_DIR}/bin/utils"
@@ -288,7 +295,7 @@ done
 
 echo "[$SCRIPT_NAME] process commands.install hooks"
 # not all core components has commands.install
-for component in app-server; do
+for component in app-server common-java-lib; do
   echo "[$SCRIPT_NAME] - ${component}"
   # FIXME: these environment variables are changed in v2
   ZOWE_ROOT_DIR=${ZOWE_ROOT_DIR} \

CHANGELOG.md

@@ -13,10 +13,12 @@ All notable changes to the Zowe Installer will be documented in this file.
 ## `2.13.0`
 
 ### New features and enhancements
+- Enhancement: Added utility "getesm" into bin/utils. When run it outputs to STDOUT which ESM your system is using. (#3662)
 
 #### Minor enhancements/defect fixes
 - Bugfix: Workflow files in the Zowe PAX are now ASCII-encoded. Fixes [#3591](https://github.com/zowe/zowe-install-packaging/issues/3591).
 
+
 ## `2.12.0`
 
 ### New features and enhancements

bin/README.md

@@ -56,6 +56,7 @@ Please be aware of using functions marked as `@experimental`. These functions ma
 
 - `bin/utils/opercmd.rex`: To issue operator command on z/OS. This script can only run on z/OS.
 - `bin/utils/curl.js`: This is node.js script works similar to popular Linux tool `curl`. It can make HTTP/HTTPS request and display response.
+- `bin/utils/getesm`: Executable to get the name of External Security Manager
 
 Please be aware of using utilities marked as `@experimental`. These utilities may be changed or improved in the future, and they may not be stable enough for extenders to use if they target to support multiple versions of Zowe.
 

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
 }
 

bin/libs/component.ts

@@ -667,7 +667,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;
 }

bin/utils/date-add.rex

@@ -56,7 +56,7 @@ target = today + days
 ISOTarget = Date("Standard", target, "Base")
 
 /* ISOTarget YYYYMMDD                                  */
-/*           12344578 => YYYY = 1234, MM = 56, DD = 78 */
+/*           12345678 => YYYY = 1234, MM = 56, DD = 78 */
 
 if pos("YYYY", dformat) = 0 then
   dformat = overlay("34", dformat, pos("YY", dformat))

example-zowe.yaml

@@ -9,18 +9,19 @@
 ################################################################################
 
 #===============================================================================
-# This is a YAML configuration file for Zowe instance.
+# This is a YAML configuration file for a Zowe instance.
 #
 # YAML is a human-friendly data serialization language for all programming languages.
 # To learn more about YAML specifications, please check https://yaml.org/.
 #
-# To learn more details about the entries, please check https://docs.zowe.org/.
+# To learn more details about the content of this file, please check https://docs.zowe.org/.
 #
 # For first time users, or for the most common use cases, please pay more
-# attention on the entries marked with "**COMMONLY_CUSTOMIZED**".
+# attention to the entries marked with "**COMMONLY_CUSTOMIZED**". A "directory" refers
+# to a directory in z/OS Unix.
 #
 # If you modify any settings listed in "zwe init --help" command, you may need to
-# re-run "zwe init" command to make them take effect.
+# re-run the "zwe init" command to make them take effect.
 #===============================================================================
 
 #-------------------------------------------------------------------------------
@@ -268,10 +269,15 @@ zowe:
   # **COMMONLY_CUSTOMIZED**
   # Zowe runtime (root) directory
   #
-  # **NOTE**: if it is not specified and you passed "--update-config" argument
-  # when you run "zwe init" command, this value will be updated with the Zowe
+  # **NOTE**: 
+  # 1. if it is not specified and you passed "--update-config" argument
+  # when you ran "zwe init" command, this value will be updated with the Zowe
   # runtime where the "zwe" command is located.
   #
+  # 2. the runtime directory is designed to be "read only". This is different from the
+  # log, workspace, and extension directories. Setting those three to the same parent folder
+  # as the runtime directory is unsupported & may cause issues
+  #
   # This value is required by ZWESLSTC to know where is Zowe runtime.
   runtimeDirectory: ""
 
@@ -325,8 +331,8 @@ zowe:
 
   # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   # **COMMONLY_CUSTOMIZED**
-  # You can list your external domains how you want to access Zowe.
-  # This should be the domain list you would like to put into your web browser
+  # You can list your external domains on how you want to access Zowe.
+  # This should be the domain list you would like to put into your web browser's
   # address bar.
   externalDomains:
     # this should be the domain name to access Zowe APIML Gateway
@@ -351,7 +357,8 @@ zowe:
   #   ZWED_TN3270_PORT: 23
 
   # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-  # You can define any Zowe message portions to be checked for and the whole message added to the system log 
+  # You can define any Zowe message portions to be checked for and the message added to the 
+  # system log upon its logging, truncated to 126 characters. 
   sysMessages:
   #   # Zowe starting
     - "ZWEL0021I"
@@ -375,15 +382,15 @@ zowe:
   #   # ZSS ready
     - "ZWES1013I"
 
-  #   # Not limited to Zowe message ID's
+  #   # Not limited to Zowe message ID's, you can specify your own string for example:
   #   - "ERROR"
 
   # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-  # Enable debug mode for zowe launch scripts
+  # Enable debug mode for Zowe launch scripts
   launchScript:
-    # set to "debug" or "trace" to display extra debug information
+    # Set to "debug" or "trace" to display extra debug information
     logLevel: "info"
-    # set to "exit" if you'd like startup to exit if any component has an error in the configure stage, otherwise zwe will warn but continue.
+    # Set to "exit" if you'd like startup to exit if any component has an error in the configure stage, otherwise zwe will warn but continue.
     onComponentConfigureFail: "warn"
 
   # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -421,7 +428,7 @@ zowe:
   #              This mode does not validate certificate Common Name and Subject
   #              Alternative Name (SAN).
   # - DISABLED:  disable certificate validation. This is NOT recommended for
-  #              security 
+  #              security. 
   verifyCertificates: STRICT
 
 
@@ -463,7 +470,7 @@ node:
 #-------------------------------------------------------------------------------
 zOSMF:
   # **COMMONLY_CUSTOMIZED**
-  # host name of your z/OSMF instance
+  # Host name of your z/OSMF instance
   host: dvipa.my-company.com
   # **COMMONLY_CUSTOMIZED**
   port: 443

manifest.json.template

@@ -1,6 +1,6 @@
 {
   "name": "Zowe",
-  "version": "2.13.0",
+  "version": "2.14.0",
   "description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.",
   "license": "EPL-2.0",
   "homepage": "https://zowe.org",
@@ -97,7 +97,7 @@
       "exclusions": ["*PR*.zip"]
     },
     "org.zowe.apiml.sdk.common-java-lib-package": {
-      "version": "~2.0.0-SNAPSHOT",
+      "version": "^2.0.0-SNAPSHOT",
       "artifact": "common-java-lib-*.zip",
       "exclusions": ["*PR*.zip"]
     },
@@ -111,6 +111,10 @@
       "artifact": "cloud-gateway-*.zip",
       "exclusions": ["*PR*.zip"]
     },
+    "org.zowe.getesm": {
+      "version": "^2.0.0-V2.X-STAGING",
+      "artifact": "*.pax"
+    },
     "org.zowe.configmgr": {
       "version": "^2.0.0-V2.X-STAGING",
       "artifact": "*.pax"

schemas/zowe-yaml-schema.json

@@ -578,6 +578,10 @@
           "$ref": "#/$defs/port",
           "description": "Port number of your z/OSMF instance."
         },
+        "scheme": {
+          "$ref" : "#/$defs/scheme",
+          "description": "Scheme used to connect to z/OSMF instance. Optional for outbout AT-TLS, defaults to https"
+        },
         "applId": {
           "type": "string",
           "description": "Appl ID of your z/OSMF instance."
@@ -627,6 +631,14 @@
       "minimum": 0,
       "maximum": 65535
     },
+    "scheme": {
+      "type": "string",
+      "enum": [
+        "http",
+        "https"
+      ],
+      "default": "https"
+    },
     "certificate": {
       "oneOf": [
         { "$ref": "#/$defs/pkcs12-certificate" }, 
@@ -849,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",

smpe/bld/service/promoted-apar.txt

@@ -1,3 +1,6 @@
+IO29343
+IO29344
+IO29345
 IO29289
 IO29290
 IO29291

smpe/bld/service/promoted-close.txt

@@ -1,3 +1,48 @@
+    IO29343 -
+      PROBLEM SUMMARY:
+      ****************************************************************
+      * USERS AFFECTED: All Zowe users                               *
+      ****************************************************************
+      * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the   *
+      *                      community release                       *
+      ****************************************************************
+      * RECOMMENDATION: Apply provided service                       *
+      ****************************************************************
+      The Zowe community version was updated to 2.13.0.
+      This PTF provides the community changes in SMP/E format.
+      Follow this link for more details on the community changes:
+      https://docs.zowe.org/stable/
+
+    IO29344 -
+      PROBLEM SUMMARY:
+      ****************************************************************
+      * USERS AFFECTED: All Zowe users                               *
+      ****************************************************************
+      * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the   *
+      *                      community release                       *
+      ****************************************************************
+      * RECOMMENDATION: Apply provided service                       *
+      ****************************************************************
+      The Zowe community version was updated to 2.13.0.
+      This PTF provides the community changes in SMP/E format.
+      Follow this link for more details on the community changes:
+      https://docs.zowe.org/stable/
+
+    IO29345 -
+      PROBLEM SUMMARY:
+      ****************************************************************
+      * USERS AFFECTED: All Zowe users                               *
+      ****************************************************************
+      * PROBLEM DESCRIPTION: Update Zowe FMID AZWE002 to match the   *
+      *                      community release                       *
+      ****************************************************************
+      * RECOMMENDATION: Apply provided service                       *
+      ****************************************************************
+      The Zowe community version was updated to 2.13.0.
+      This PTF provides the community changes in SMP/E format.
+      Follow this link for more details on the community changes:
+      https://docs.zowe.org/stable/
+
     IO29289 -
       PROBLEM SUMMARY:
       ****************************************************************

smpe/bld/service/promoted-hold.txt

@@ -1,3 +1,28 @@
+++HOLD(UO90045) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23348)
+  COMMENT(
+  ****************************************************************
+  * Affected function: Zowe servers                              *
+  ****************************************************************
+  * Description: stop servers                                    *
+  ****************************************************************
+  * Timing: pre-APPLY                                            *
+  ****************************************************************
+  * Part: ZWESLSTC and ZWESISTC                                  *
+  ****************************************************************
+  Stop the Zowe servers before installing this update.
+
+  ****************************************************************
+  * Affected function: Zowe servers                              *
+  ****************************************************************
+  * Description: start servers                                   *
+  ****************************************************************
+  * Timing: post-APPLY                                           *
+  ****************************************************************
+  * Part: ZWESLSTC and ZWESISTC                                  *
+  ****************************************************************
+  Start the Zowe servers after installing this update.
+
+  ).
 ++HOLD(UO90033) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(23297)
   COMMENT(
   ****************************************************************

smpe/bld/service/promoted-ptf.txt

@@ -1,3 +1,5 @@
+UO90045
+UO90046
 UO90033
 UO90034
 UO90031

smpe/bld/service/ptf-bucket.txt

@@ -19,6 +19,6 @@
 #UO90022 UO90023 - IO29185 IO29186   IO29187 - Fri Jul 28 01:08:59 UTC 2023
 #UO90031 UO90032 - IO29286 IO29287   IO29288 - Tue Sep 12 18:27:05 UTC 2023
 #UO90033 UO90034 - IO29289 IO29290   IO29291 - Tue Oct 24 19:49:48 UTC 2023
-UO90045 UO90046 - IO29343 IO29344   IO29345
+#UO90045 UO90046 - IO29343 IO29344   IO29345 - Thu Dec 14 16:23:26 UTC 2023
 UO90047 UO90048 - IO29346 IO29347   IO29348
 UO90049 UO90050 - IO29349 IO29350   IO29351