Periodic v2 to v3 sync (#3933)

* install command step optional Signed-off-by: pz636264 <[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]> * add sleep buffer to uss test Signed-off-by: MarkAckert <[email protected]> --------- Signed-off-by: pz636264 <[email protected]> Signed-off-by: Martin Zeithaml <[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: pz636264 <[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: Martin Zeithaml <[email protected]>
zowe · Aug 12, 2024 · b346605 · b346605
1 parent d8733f7
commit b346605
Show file tree

Hide file tree

Showing 11 changed files with 136 additions and 99 deletions.
diff --git a/.github/scripts/manifest_verification/check_sources.js b/.github/scripts/manifest_verification/check_sources.js
@@ -81,15 +81,18 @@ async function main() {
       }
 
       // If not a commit, check repo tags
-      const tags = await octokit.rest.repos.listTags({
-        owner: 'zowe',
-        repo: repo,
-      }).then((resp) => {
-        if (resp.status < 400) {
-          return resp.data;
+      //  requires paginate API.
+
+      const tags = await octokit.paginate(
+        "GET /repos/{owner}/{repo}/tags",
+        {
+            owner: 'zowe',
+            repo: repo,
         }
-        return [];
-      })
+      ).then((resp) => {
+        // resp is the aggregated data from paginate.. [ { name: 'tag-a', ..other-fields.. }, {}, {}, ...]
+        return resp; 
+      });
 
       const knownTag = tags.find((item) => item.name === tag);
       if (knownTag != null && knownTag.name.trim().length > 0) {

diff --git a/.github/scripts/manifest_verification/package-lock.json b/.github/scripts/manifest_verification/package-lock.json
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/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,7 +176,7 @@ 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
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**
@@ -211,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**
@@ -235,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/defaults.yaml b/files/defaults.yaml
@@ -70,15 +70,15 @@ zowe:
 
       # Distinguished name for Zowe generated certificates.
       dname: 
-        caCommonName: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'Zowe Development Instances CA' : null }}"
-        commonName: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'Zowe Development Instances Certificate' : null }}"
-        orgUnit: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'API Mediation Layer' : null }}"
-        org: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'Zowe Sample' : null }}"
-        locality: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'Prague' : null }}"
-        state: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'Prague' : null }}"
-        country: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.label) ? 'CZ' : null }}"
+        caCommonName: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'Zowe Development Instances CA' : null }}"
+        commonName: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'Zowe Development Instances Certificate' : null }}"
+        orgUnit: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'API Mediation Layer' : null }}"
+        org: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'Zowe Sample' : null }}"
+        locality: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'Prague' : null }}"
+        state: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'Prague' : null }}"
+        country: "${{ (zowe.setup.certificate.pkcs12?.name || zowe.setup.certificate.keyring?.name) ? 'CZ' : null }}"
       # Validity days for Zowe generated certificates
-      validity: "${{ (zowe.setup.certificate.pkcs12?.import || zowe.setup.certificate.keyring?.label) ? null : 3650 }}"
+      validity: "${{ (zowe.setup.certificate.pkcs12?.import || zowe.setup.certificate.keyring?.name) ? null : 3650 }}"
 
     vsam:
       # Default to caching service entry as it predates this one

diff --git a/manifest.json.template b/manifest.json.template
@@ -109,7 +109,7 @@
       "artifact": "*.pax"
     },
     "org.zowe.launcher": {
-      "version": "^2.0.0-SNAPSHOT"
+      "version": "^2.0.0-STAGING"
     },
     "org.zowe.keyring-utilities": {
       "version": "1.0.4",

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
@@ -227,31 +227,31 @@
                       "description": "Certificate distinguish name",
                       "properties": {
                         "caCommonName": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Common name of certificate authority generated by Zowe."
                         },
                         "commonName": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Common name of certificate generated by Zowe."
                         },
                         "orgUnit": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Organization unit of certificate generated by Zowe."
                         },
                         "org": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Organization of certificate generated by Zowe."
                         },
                         "locality": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Locality of certificate generated by Zowe. This is usually the city name."
                         },
                         "state": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "State of certificate generated by Zowe. You can also put province name here."
                         },
                         "country": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "2 letters country code of certificate generated by Zowe."
                         }
                       }
@@ -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(?:jce(?:cca|hybrid)?)?:\/\/.*"
+              "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(?:jce(?:cca|hybrid)?)?:\/\/.*"
+              "pattern": "^safkeyring[a-z]*:\/\/.*"
             },
             "password": {
               "type": "string",

diff --git a/tests/sanity/test/e2e/test-04-uss-explorer.js b/tests/sanity/test/e2e/test-04-uss-explorer.js
@@ -127,6 +127,7 @@ describe(`test ${APP_TO_TEST}`, function() {
     // save screenshot
     await saveScreenshotWithIframeAppContext(this, driver, testName, 'file-list-loaded', APP_TO_TEST, MVD_IFRAME_APP_CONTEXT);
     treeContent = await waitUntilElement(driver, MVD_EXPLORER_TREE_SECTION);
+    await driver.sleep(3000); // buffer sleep time; tree content appeared but wasn't done populating
 
     // load children of DIR_TO_TEST
     const items = await getElements(treeContent, 'ul li');