v2.18 Staging to RC (#3938)

* Remove deprecated commented value for createZosmfTrust Signed-off-by: Joe Winchester <[email protected]> * Change path to home (#3896) Signed-off-by: Martin Zeithaml <[email protected]> Co-authored-by: 1000TurquoisePogs <[email protected]> * install command step optional Signed-off-by: pz636264 <[email protected]> * fix (#3897) Signed-off-by: Pavel Jares <[email protected]> * Backport fixes in the v2.x/rc branch to staging (#3907) * Fix default schema validation error when using keyrings (#3901) Signed-off-by: 1000TurquoisePogs <[email protected]> * Respect "import" option on pkcs12 certificate setup (#3905) Signed-off-by: 1000TurquoisePogs <[email protected]> --------- Signed-off-by: 1000TurquoisePogs <[email protected]> Co-authored-by: 1000TurquoisePogs <[email protected]> * Minor changes Signed-off-by: Martin Zeithaml <[email protected]> * Minor update Signed-off-by: Martin Zeithaml <[email protected]> * language refactor Signed-off-by: Andrew Jandacek <[email protected]> * fix component abstract/description language Signed-off-by: Andrew Jandacek <[email protected]> * fix abstract lengths Signed-off-by: Andrew Jandacek <[email protected]> * Promote PTF after release v2.17.0 Signed-off-by: zowe-robot <[email protected]> * update manifest to create 2.18 staging builds Signed-off-by: MarkAckert <[email protected]> * Switch launcher path to point to staging Signed-off-by: James Struga <[email protected]> * Backport fixes in v2.x/master to v2.x/staging (#3923) * Rename ssh host name (#3927) Signed-off-by: ManjuVNair133 <[email protected]> * Clean up for crashing java (#3931) Signed-off-by: Martin Zeithaml <[email protected]> * update safkeyring schema (#3928) Signed-off-by: MarkAckert <[email protected]> * Use correct parameters (#3929) Signed-off-by: Martin Zeithaml <[email protected]> * NONRLS vsam mode if variable not initialized (#3935) Signed-off-by: pz636264 <[email protected]> * update licenses Signed-off-by: MarkAckert <[email protected]> --------- Signed-off-by: Joe Winchester <[email protected]> Signed-off-by: Martin Zeithaml <[email protected]> Signed-off-by: pz636264 <[email protected]> Signed-off-by: Pavel Jares <[email protected]> Signed-off-by: 1000TurquoisePogs <[email protected]> Signed-off-by: Andrew Jandacek <[email protected]> Signed-off-by: zowe-robot <[email protected]> Signed-off-by: MarkAckert <[email protected]> Signed-off-by: James Struga <[email protected]> Signed-off-by: ManjuVNair133 <[email protected]> Signed-off-by: Martin Zeithaml <[email protected]> Co-authored-by: Joe Winchester <[email protected]> Co-authored-by: Martin Zeithaml <[email protected]> Co-authored-by: 1000TurquoisePogs <[email protected]> Co-authored-by: pz636264 <[email protected]> Co-authored-by: Pavel Jareš <[email protected]> Co-authored-by: Martin Zeithaml <[email protected]> Co-authored-by: Andrew Jandacek <[email protected]> Co-authored-by: zowe-robot <[email protected]> Co-authored-by: James Struga <[email protected]> Co-authored-by: James Struga <[email protected]> Co-authored-by: ManjuVNair133 <[email protected]> Co-authored-by: pavelzlatnik <[email protected]>
zowe · Aug 14, 2024 · 80e2724 · 80e2724
1 parent 3ab1680
commit 80e2724
Show file tree

Hide file tree

Showing 17 changed files with 206 additions and 95 deletions.
diff --git a/bin/commands/support/verify-fingerprints/index.sh b/bin/commands/support/verify-fingerprints/index.sh
@@ -63,7 +63,10 @@ print_message "- Calculate hashes of Zowe files"
 cust_hashes=$(create_tmp_file "${tmp_file_prefix}")
 result=$(java -cp "${ZWE_zowe_runtimeDirectory}/bin/utils/" HashFiles "${all_files}" | sort > "${cust_hashes}")
 code=$?
-if [ ${code} -eq 1 -o ! -f "${cust_hashes}" ]; then
+if [ -f "${cust_hashes}" ]; then
+  file_size_check=$(wc -l "${cust_hashes}" | awk '{print $1}')
+fi
+if [ "${code}" -eq 1 -o ! -f "${cust_hashes}" -o "${file_size_check}" -eq 0 ]; then
   print_error "  * Error ZWEL0151E: Failed to create temporary file ${cust_hashes}. Please check permission or volume free space."
   print_error "  * Exit code: ${code}"
   print_error "  * Output:"

diff --git a/bin/libs/java.sh b/bin/libs/java.sh
@@ -83,7 +83,7 @@ require_java() {
   fi
 
   if [ -z "${JAVA_HOME}" ]; then
-    print_error_and_exit "Error ZWEL0122E: Cannot find java. Set the java.path value in the Zowe YAML, or include java in the PATH environment variable of any accounts that start or manage Zowe" "" 122
+    print_error_and_exit "Error ZWEL0122E: Cannot find java. Set the java.home value in the Zowe YAML, or include java in the PATH environment variable of any accounts that start or manage Zowe" "" 122
   fi
 
   ensure_java_is_on_path

diff --git a/bin/libs/node.sh b/bin/libs/node.sh
@@ -94,7 +94,7 @@ require_node() {
   fi
 
   if [ -z "${NODE_HOME}" ]; then
-    print_error_and_exit "Error ZWEL0121E: Cannot find node. Set the node.path value in the Zowe YAML, or include node in the PATH environment variable of any accounts that start or manage Zowe" "" 121
+    print_error_and_exit "Error ZWEL0121E: Cannot find node. Set the node.home value in the Zowe YAML, or include node in the PATH environment variable of any accounts that start or manage Zowe" "" 121
   fi
 
   ensure_node_is_on_path

diff --git a/bin/libs/zosmf.ts b/bin/libs/zosmf.ts
@@ -31,7 +31,7 @@ export function validateZosmfHostAndPort(zosmfHost: string, zosmfPort: number):
     common.printError(`Warning: Could not validate if z/OS MF is available on 'https://${zosmfHost}:${zosmfPort}/zosmf/info'. NODE_HOME is not defined.`);
     zosmfCheckPassed=false;
   } else {
-    let execReturn = shell.execOutSync(`${std.getenv('NODE_HOME')}/bin/node`, `${std.getenv('ZWE_zowe_runtimeDirectory')}/bin/utils/curl.js`, `"https://${zosmfHost}:${zosmfPort}/zosmf/info"`, `-k`, `-H`, `"X-CSRF-ZOSMF-HEADER: true"`, `--response-type`, `status`);
+    const execReturn = shell.execOutSync(`${std.getenv('NODE_HOME')}/bin/node`, `${std.getenv('ZWE_zowe_runtimeDirectory')}/bin/utils/curl.js`, `https://${zosmfHost}:${zosmfPort}/zosmf/info`, `-k`, `-H`, `X-CSRF-ZOSMF-HEADER: true`, `--response-type`, `status`);
     if (execReturn.rc || !execReturn.out) {
       common.printError(`Warning: Could not validate if z/OS MF is available on 'https://${zosmfHost}:${zosmfPort}/zosmf/info'. No response code from z/OSMF server.`);
       zosmfCheckPassed=false

diff --git a/example-zowe.yaml b/example-zowe.yaml
@@ -98,7 +98,7 @@ zowe:
     # >>>> Certificate setup scenario 1
     # PKCS12 (keystore) with Zowe generate certificates.
     certificate:
-      # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+      # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
       type: PKCS12
       pkcs12:
         # **COMMONLY_CUSTOMIZED**
@@ -143,7 +143,7 @@ zowe:
     # # >>>> Certificate setup scenario 2
     # # PKCS12 (keystore) with importing certificate generated by other CA.
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: PKCS12
     #   pkcs12:
     #     # **COMMONLY_CUSTOMIZED**
@@ -176,9 +176,8 @@ zowe:
     # # >>>> Certificate setup scenario 3
     # # Zowe generated z/OS Keyring with Zowe generated certificates.
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: JCERACFKS
-    #   createZosmfTrust: true
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**
     #     # keyring name
@@ -212,7 +211,7 @@ zowe:
     # # >>>> Certificate setup scenario 4
     # # Zowe generated z/OS Keyring and connect to existing certificate
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: JCERACFKS
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**
@@ -236,7 +235,7 @@ zowe:
     # # >>>> Certificate setup scenario 5
     # # Zowe generated z/OS Keyring with importing certificate stored in data set
     # certificate:
-    #   # Type of certificate storage. Valid values are: PKCS12, JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
+    #   # Type of certificate storage. Valid values are: PKCS12, JCERACFKS. APIML additionally supports: JCEKS, JCECCAKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: JCERACFKS
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**

diff --git a/files/SZWESAMP/ZWEINSTL b/files/SZWESAMP/ZWEINSTL
@@ -36,20 +36,24 @@ blksize(32760) unit(sysallda) space(30,15) tracks
 //STDOUT   DD SYSOUT=*
 //STDERR   DD SYSOUT=*
 //STDPARM DD *
-SH cd {zowe.runtimeDirectory} &&
-cd files/SZWESAMP &&
+SH cd '{zowe.runtimeDirectory}' &&
+cd 'files/SZWESAMP' &&
 cp * "//'{zowe.setup.dataset.prefix}.SZWESAMP'" &&
-cd ../SZWEEXEC &&
+cd '../SZWEEXEC' &&
 cp * "//'{zowe.setup.dataset.prefix}.SZWEEXEC'" &&
-cd ../SZWELOAD &&
+cd '../SZWELOAD' &&
 cp * "//'{zowe.setup.dataset.prefix}.SZWELOAD'" &&
-cd ../../components/launcher/bin
-cp zowe_launcher "//'{zowe.setup.dataset.prefix}.SZWEAUTH'" &&
-cd ../../zss/SAMPLIB &&
-cp ZWESASTC ZWESIP00 ZWESISTC ZWESISCH
+cd '../../components/launcher/bin' &&
+cp zowe_launcher
+   "//'{zowe.setup.dataset.prefix}.SZWEAUTH(ZWELNCH)'" &&
+cd '../../zss/SAMPLIB' &&
+cp ZWESIP00 ZWESISCH
    "//'{zowe.setup.dataset.prefix}.SZWESAMP'" &&
-cd ../LOADLIB &&
+cp ZWESAUX
+   "//'{zowe.setup.dataset.prefix}.SZWESAMP(ZWESASTC)'" &&
+cp ZWESIS01
+   "//'{zowe.setup.dataset.prefix}.SZWESAMP(ZWESISTC)'" &&
+cd '../LOADLIB' &&
 cp ZWESIS01 ZWESAUX ZWESISDL
    "//'{zowe.setup.dataset.prefix}.SZWEAUTH'"
 /*
-
diff --git a/files/SZWESAMP/ZWEITSS b/files/SZWESAMP/ZWEITSS
@@ -99,7 +99,7 @@
 
 /* userid for ZOWE main server                                       */
   TSS LIST({zowe.setup.security.users.zowe}) SEGMENT(OMVS)
-  TSS CREATE({zowe.setup.security.users.zowe}) TYPE(USER) PASS(NOPW,0) +
+  TSS CREATE({zowe.setup.security.users.zowe}) TYPE(USER) PROTECTED +
    NAME('ZOWE MAIN SERVER') +
    DEPT(&STCUDEP.)
    TSS ADD({zowe.setup.security.users.zowe}) +
@@ -109,7 +109,7 @@
 
 /* userid for ZIS cross memory server                                */
   TSS LIST({zowe.setup.security.users.zis}) SEGMENT(OMVS)
-  TSS CREATE({zowe.setup.security.users.zis}) TYPE(USER) PASS(NOPW,0) +
+  TSS CREATE({zowe.setup.security.users.zis}) TYPE(USER) PROTECTED +
    NAME('ZOWE ZIS CROSS MEMORY SERVER') +
    DEPT(&STCUDEP.)
   TSS ADD({zowe.setup.security.users.zis}) +

diff --git a/manifest.json.template b/manifest.json.template
@@ -1,6 +1,6 @@
 {
   "name": "Zowe",
-  "version": "2.17.0",
+  "version": "2.18.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",
@@ -136,7 +136,7 @@
       "version": "2.0.3"
     },
     "org.zowe.licenses": {
-      "version": "2.16.0",
+      "version": "2.18.0",
       "artifact": "zowe_licenses_full.zip"
     }
   },

diff --git a/playbooks/host_vars/tvt4188.yml b/playbooks/host_vars/tvt4188.yml
@@ -1,5 +1,5 @@
 ---
-ansible_ssh_host: tvt4188.svl.ibm.com
+ansible_ssh_host: tvt4188.pok.stglabs.ibm.com
 ansible_user:
 ansible_password:
 
@@ -16,7 +16,7 @@ zowe_smpe_volser: T41882
 # caching service volume
 zowe_caching_vsam_volume: T41882
 
-zowe_external_ip_address: 9.30.241.209
+zowe_external_ip_address: 9.47.90.163
 zowe_zlux_terminal_telnet_port: 992
 zowe_zlux_terminal_telnet_security_type: tls
 zowe_apiml_security_x509_enabled: true
diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json
@@ -804,7 +804,7 @@
             "file": {
               "type": "string",
               "description": "Path of your z/OS keyring, including ring owner and ring name. Case sensitivity and spaces matter.",
-              "pattern": "^safkeyring:\/\/.*"
+              "pattern": "^safkeyring[a-z]*:\/\/.*"
             },
             "password": {
               "type": "string",
@@ -831,7 +831,7 @@
             "file": {
               "type": "string",
               "description": "Path of your z/OS keyring, including ring owner and ring name. Case sensitivity and spaces matter.",
-              "pattern": "^safkeyring:\/\/.*"
+              "pattern": "^safkeyring[a-z]*:\/\/.*"
             },
             "password": {
               "type": "string",

diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt
@@ -1,3 +1,6 @@
+IO29428
+IO29429
+IO29430
 IO29424
 IO29425
 IO29426

diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt
@@ -1,3 +1,48 @@
+    IO29428 -
+      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.17.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/
+
+    IO29429 -
+      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.17.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/
+
+    IO29430 -
+      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.17.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/
+
     IO29424 -
       PROBLEM SUMMARY:
       ****************************************************************

diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt
@@ -1,3 +1,28 @@
+++HOLD(UO90059) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24200)
+  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(UO90057) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24144)
   COMMENT(
   ****************************************************************

diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt
@@ -1,3 +1,5 @@
+UO90059
+UO90060
 UO90057
 UO90058
 UO90049

diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt
@@ -23,5 +23,5 @@
 #UO90047 UO90048 - IO29346 IO29347   IO29348 - Fri Jan 26 17:21:09 UTC 2024
 #UO90049 UO90050 - IO29349 IO29350   IO29351 - Fri Mar  8 19:42:44 UTC 2024
 #UO90057 UO90058 - IO29424 IO29425   IO29426 - Fri May 24 14:23:02 UTC 2024
-UO90059 UO90060 - IO29428 IO29429   IO29430
+#UO90059 UO90060 - IO29428 IO29429   IO29430 - Thu Jul 18 16:30:14 UTC 2024
 UO90061 UO90062 - IO29431 IO29432   IO29433
-Original file line number
+Diff line change
@@ -1,3 +1,6 @@
+    IO29428
+    IO29429
+    IO29430
     IO29424
     IO29425
     IO29426
@@ Expand Down @@