diff --git a/.github/scripts/manifest_verification/check_sources.js b/.github/scripts/manifest_verification/check_sources.js index 31293432f8..8514553108 100644 --- 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 index 784fe7954d..31f555dc36 100644 --- a/.github/scripts/manifest_verification/package-lock.json +++ b/.github/scripts/manifest_verification/package-lock.json @@ -10,7 +10,7 @@ "license": "EPL-2.0", "dependencies": { "@actions/core": "1.10.1", - "@actions/github": "^6.0.0", + "@actions/github": "6.0.0", "fs-extra": "11.2.0" } }, diff --git a/bin/commands/support/verify-fingerprints/index.sh b/bin/commands/support/verify-fingerprints/index.sh index 0044c5e48a..3a67cc129b 100644 --- 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 index 25ca4b77b5..812f46b7b5 100644 --- 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 index 9d9249c81a..525a794991 100644 --- 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 index 8b32c91796..8705166e9a 100644 --- 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 index 86f91a72fa..6194230ca9 100644 --- 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 index ce58c19764..d158b19685 100644 --- 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 index 1b59f71311..deadae3492 100644 --- 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 index 9b2eca1576..abe547007f 100644 --- 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'); diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index c51f0b78f4..8a44349963 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -101,8 +101,8 @@ - VSAM data set with Record-Level-Sharing enabled or not - VSAM data set with Record-Level-Sharing enabled or not + VSAM data set with Record-Level-Sharing enabled or disabled + VSAM data set with Record-Level-Sharing enabled or disabled components @@ -202,8 +202,8 @@ It is used by ZWESLSTC or by zwe command - This should be the domain name of your Dynamic VIP Address (DVIPA) - This should be the domain name of your Dynamic VIP Address (DVIPA) + The domain name of your Dynamic VIP Address (DVIPA) + The domain name of your Dynamic VIP Address (DVIPA) zowe @@ -213,7 +213,7 @@ It is used by ZWESLSTC or by zwe command - This is the port you use to access Zowe Gateway from your web browser + The port you use to access Zowe Gateway from your web browser This is the port you use to access Zowe Gateway from your web browser. In many use cases, this should be same as <b>components.gateway.port</b>. But in some use cases, like containerization, this port could be different. @@ -268,7 +268,7 @@ some use cases, like containerization, this port could be different. - Zowe certificate keystore file. In case of keyring the format is "safkeyring://OWNER/KEYRING". + Zowe certificate keystore file. For keyring, the format is "safkeyring://OWNER/KEYRING". Zowe certificate keystore file certificates @@ -317,7 +317,7 @@ some use cases, like containerization, this port could be different. - File location for the certificate truststore. Keyring is in the format "safkeyring://OWNER/KEYRING". + File location for cert truststore. For keyring, the format is "safkeyring://OWNER/KEYRING" File location for the certificate truststore certificates @@ -448,9 +448,9 @@ How we want to verify SSL certificates of services. Valid values are: - - Should the APIML gateway be enabled? - Should the APIML gateway be enabled? + + Check this option to enable the gateway + Check this option to enable the gateway components @@ -460,8 +460,8 @@ How we want to verify SSL certificates of services. Valid values are: - Port for the APIML gateway - Port for the APIML gateway + Port for the API ML gateway + Port for the API ML gateway components @@ -579,9 +579,9 @@ How we want to verify SSL certificates of services. Valid values are: - - Use this option to enable the API catalog - Use this option to enable the API catalog + + Check this option to enable the API Catalog + Check this option to enable the API Catalog components @@ -591,8 +591,8 @@ How we want to verify SSL certificates of services. Valid values are: - Port on which the API catalog should be running. - Port on which the API catalog should be running. + Port on which the API Catalog should be running. + Port on which the API Catalog should be running. components @@ -602,8 +602,8 @@ How we want to verify SSL certificates of services. Valid values are: - Extra debugging information from API catalog. - Extra debugging information from API catalog. + Extra debugging information from API Catalog. + Extra debugging information from API Catalog. components @@ -612,9 +612,9 @@ How we want to verify SSL certificates of services. Valid values are: - - Should the automatic discovery be enabled? - Should the automatic discovery be enabled? + + Check this option to enable the Discovery service + Check this option to enable the Discovery service components @@ -624,8 +624,8 @@ How we want to verify SSL certificates of services. Valid values are: - Port on which the discovery service should be running - Port on which the discovery service should be running + Port on which the Discovery service should be running + Port on which the Discovery service should be running components @@ -635,8 +635,8 @@ How we want to verify SSL certificates of services. Valid values are: - Should there be extra debugging information? - Should there be extra debugging information? + Check this option to include extra debugging information + Check this option to include extra debugging information components @@ -645,9 +645,9 @@ How we want to verify SSL certificates of services. Valid values are: - - Check to enable the caching service - Check to enable the caching service + + Check this option to enable the Caching service + Check this option to enable the Caching service components @@ -679,7 +679,7 @@ How we want to verify SSL certificates of services. Valid values are: - Specifies the eviction strategy when storage size is achieved. + Specifies the eviction strategy when storage size is achieved Specifies the eviction strategy when storage size is achieved. components @@ -693,7 +693,7 @@ How we want to verify SSL certificates of services. Valid values are: Specifies the components caching service storage mode - Specifies the components caching service storage mode + Specifies the components caching service storage mode. components @@ -708,7 +708,7 @@ How we want to verify SSL certificates of services. Valid values are: Number of records before the eviction strategies kick in - Number of records before the eviction strategies kick in + Number of records before the eviction strategies kick in. components @@ -738,9 +738,9 @@ How we want to verify SSL certificates of services. Valid values are: - + Check this option to enable the app server - Check this option to enable the app server + Check this option to enable the app server. components @@ -751,7 +751,7 @@ How we want to verify SSL certificates of services. Valid values are: Check to get extra debug information from the service - Check to get extra debug information from the service + Check to get extra debug information from the service. components @@ -772,8 +772,8 @@ How we want to verify SSL certificates of services. Valid values are: - Check this option to enable the ZSS component - Check this option to enable the ZSS component + Check this option to enable ZSS + Check this option to enable ZSS components @@ -828,7 +828,7 @@ How we want to verify SSL certificates of services. Valid values are: Check this option to enable the jobs API - Check this option to enable the jobs API + Check this option to enable the jobs API. components @@ -839,7 +839,7 @@ How we want to verify SSL certificates of services. Valid values are: Check to get extra debug information from the service - Check to get extra debug information from the service + Check to get extra debug information from the service. components @@ -861,7 +861,7 @@ How we want to verify SSL certificates of services. Valid values are: Check this option to enable the files API - Check this option to enable the files API + Check this option to enable the files API. components @@ -872,7 +872,7 @@ How we want to verify SSL certificates of services. Valid values are: Check to get extra debug information from the service - Check to get extra debug information from the service + Check to get extra debug information from the service. components @@ -893,8 +893,8 @@ How we want to verify SSL certificates of services. Valid values are: - Check this to enable the JES explorer - Check this to enable the JES explorer + Check this option to enable the JES explorer + Check this option to enable the JES explorer. components @@ -904,8 +904,8 @@ How we want to verify SSL certificates of services. Valid values are: - Check this option to enable MVS explorer - Check this option to enable MVS explorer + Check this option to enable the MVS explorer + Check this option to enable the MVS explorer. components @@ -915,8 +915,8 @@ How we want to verify SSL certificates of services. Valid values are: - Check this option to enable USS explorer - Check this option to enable USS explorer + Check this option to enable the USS explorer + Check this option to enable the USS explorer. components @@ -926,8 +926,8 @@ How we want to verify SSL certificates of services. Valid values are: - Should Zowe configuration manager be enabled? - Should Zowe configuration manager be enabled? + Check this option to enable Zowe configuration manager + Check this option to enable Zowe configuration manager. configManager @@ -1081,6 +1081,19 @@ How we want to verify SSL certificates of services. Valid values are: ZWESASTC + + + Check to enable this run step with the zwe install command. For convenience build only. + Check this option to enable the optional workflow step with zwe install command. After Zowe convenience build is extracted, + you can enable this flag to run the zwe install command to install MVS data sets within this workflow run. + This option is for convenience build only. SMP/E installs the MVS data sets during installation. + installMVSDatasets + + + + false + + @@ -1150,6 +1163,7 @@ How we want to verify SSL certificates of services. Valid values are: + Run this step to fill base variables. 1 z/OS System Programmer @@ -1312,7 +1326,7 @@ How we want to verify SSL certificates of services. Valid values are: - + Run this step to specify the variables for the Caching Service 1 z/OS System Programmer @@ -2272,10 +2286,22 @@ echo '# enabled: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" Zowe installation Zowe installation - - Run the Zowe install - Configure the Zowe - + + Run the Zowe install (only for convenience build) + Configure Zowe. + + + + 1==1 + Always true + + + Skips this step if Install the MVS data sets was not selected + !${instance-zowe_setup_installStep_enabled} + skipped + + +