From 3eccda6837ccc00a4660a5ceb28a7590cb5a41eb Mon Sep 17 00:00:00 2001 From: pz636264 Date: Tue, 9 Jul 2024 12:50:04 +0200 Subject: [PATCH 01/17] install command step optional Signed-off-by: pz636264 --- workflows/files/ZWECONF.xml | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index 8f4ee7b153..d3185f714e 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -1147,6 +1147,19 @@ How we want to verify SSL certificates of services. Valid values are: ZWESASTC + + + Only for convenience build, check this to enable to run optional step with zwe install command + Check this to enable optional workflow step with zwe install command. After Zowe convenience build was extracted, + you can enable this flag to run the zwe install command to install MVS data sets within this workflow run. + Only for convenience build, SMP/E installs the MVS data sets during install. + installMVSDatasets + + + + false + + @@ -1219,6 +1232,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 @@ -1408,7 +1422,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 @@ -2410,10 +2424,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 the Zowe. + + + + 1==1 + Always true + + + Skips this step if Install the MVS data sets wasn't selected + !${instance-zowe_setup_installStep_enabled} + skipped + + + Date: Thu, 11 Jul 2024 13:26:11 +0200 Subject: [PATCH 02/17] Minor changes Signed-off-by: Martin Zeithaml --- files/SZWESAMP/ZWEINSTL | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/files/SZWESAMP/ZWEINSTL b/files/SZWESAMP/ZWEINSTL index 9d9249c81a..22011e9936 100644 --- a/files/SZWESAMP/ZWEINSTL +++ b/files/SZWESAMP/ZWEINSTL @@ -36,20 +36,20 @@ 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 && +cd '../../components/launcher/bin' && +cp zowe_launcher + "//'{zowe.setup.dataset.prefix}.SZWEAUTH(ZWELNCH)'" && +cd '../../zss/SAMPLIB' && cp ZWESASTC ZWESIP00 ZWESISTC ZWESISCH "//'{zowe.setup.dataset.prefix}.SZWESAMP'" && -cd ../LOADLIB && +cd '../LOADLIB' && cp ZWESIS01 ZWESAUX ZWESISDL "//'{zowe.setup.dataset.prefix}.SZWEAUTH'" /* - From a20455cc31310a34c2fd5496e147dbd2510f01ee Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Thu, 11 Jul 2024 13:43:12 +0200 Subject: [PATCH 03/17] Minor update Signed-off-by: Martin Zeithaml --- files/SZWESAMP/ZWEINSTL | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/files/SZWESAMP/ZWEINSTL b/files/SZWESAMP/ZWEINSTL index 22011e9936..525a794991 100644 --- a/files/SZWESAMP/ZWEINSTL +++ b/files/SZWESAMP/ZWEINSTL @@ -47,8 +47,12 @@ cd '../../components/launcher/bin' && cp zowe_launcher "//'{zowe.setup.dataset.prefix}.SZWEAUTH(ZWELNCH)'" && cd '../../zss/SAMPLIB' && -cp ZWESASTC ZWESIP00 ZWESISTC ZWESISCH +cp ZWESIP00 ZWESISCH "//'{zowe.setup.dataset.prefix}.SZWESAMP'" && +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'" From 7824bc8d22d230f90acbc2d270e83f4d3449cbb7 Mon Sep 17 00:00:00 2001 From: Andrew Jandacek Date: Mon, 15 Jul 2024 16:16:05 +0200 Subject: [PATCH 04/17] language refactor Signed-off-by: Andrew Jandacek --- workflows/files/ZWECONF.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index d3185f714e..1781c05b49 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -1149,10 +1149,10 @@ How we want to verify SSL certificates of services. Valid values are: - Only for convenience build, check this to enable to run optional step with zwe install command - Check this to enable optional workflow step with zwe install command. After Zowe convenience build was extracted, + This install option is only for convenience build. Check this option to enable this run step with the zwe install command. + 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. - Only for convenience build, SMP/E installs the MVS data sets during install. + This option is for convenience build only. SMP/E installs the MVS data sets during installation. installMVSDatasets @@ -2426,7 +2426,7 @@ echo '# enabled: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" Zowe installation Run the Zowe install (only for convenience build) - Configure the Zowe. + Configure Zowe. @@ -2434,7 +2434,7 @@ echo '# enabled: false' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" Always true - Skips this step if Install the MVS data sets wasn't selected + Skips this step if Install the MVS data sets was not selected !${instance-zowe_setup_installStep_enabled} skipped From e9b758b2f2179d845c5458de89e89f9b3dc1c4b3 Mon Sep 17 00:00:00 2001 From: Andrew Jandacek Date: Tue, 16 Jul 2024 15:26:47 +0200 Subject: [PATCH 05/17] fix component abstract/description language Signed-off-by: Andrew Jandacek --- workflows/files/ZWECONF.xml | 54 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index 1781c05b49..d55f7f5060 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -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 @@ -579,9 +579,9 @@ How we want to verify SSL certificates of services. Valid values are: - - Use this option to enable the metrics seervice - Use this option to enable the metrics seervice + + Check this option to enable the Metrics service + Check this option to enable the Metrics service components @@ -612,9 +612,9 @@ How we want to verify SSL certificates of services. Valid values are: - - Use this option to enable the cloud gateway - Use this option to enable the cloud gateway + + Check this option to enable the Cloud gateway + Check this option to enable the Cloud gateway components @@ -645,9 +645,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 @@ -678,9 +678,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 @@ -711,9 +711,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 @@ -804,7 +804,7 @@ 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 components @@ -838,8 +838,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 @@ -959,8 +959,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 @@ -970,8 +970,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 @@ -981,8 +981,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 From d252a5321a84590bcb644517d56eeddb29c08caa Mon Sep 17 00:00:00 2001 From: Andrew Jandacek Date: Tue, 16 Jul 2024 15:55:35 +0200 Subject: [PATCH 06/17] fix abstract lengths Signed-off-by: Andrew Jandacek --- workflows/files/ZWECONF.xml | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index d55f7f5060..183af7feb5 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 @@ -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 @@ -515,8 +515,8 @@ How we want to verify SSL certificates of services. Valid values are: - Use this to enable the security authorization endpoint - Use this to enable the security authorization endpoint + Check to enable the security authorization endpoint + Check to enable the security authorization endpoint components @@ -547,8 +547,8 @@ How we want to verify SSL certificates of services. Valid values are: - Enable gateway server internal connector - Enable gateway server internal connector + Check this option to enable gateway server internal connector + Check this option to enable gateway server internal connector components @@ -657,8 +657,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 @@ -668,8 +668,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 @@ -690,8 +690,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 @@ -701,8 +701,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 @@ -745,7 +745,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 @@ -759,7 +759,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 @@ -774,7 +774,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 @@ -806,7 +806,7 @@ 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 @@ -817,7 +817,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 @@ -894,7 +894,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 @@ -905,7 +905,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 @@ -927,7 +927,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 @@ -938,7 +938,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 @@ -960,7 +960,7 @@ How we want to verify SSL certificates of services. Valid values are: Check this option to enable the JES explorer - Check this option to enable the JES explorer + Check this option to enable the JES explorer. components @@ -971,7 +971,7 @@ How we want to verify SSL certificates of services. Valid values are: Check this option to enable the MVS explorer - Check this option to enable the MVS explorer + Check this option to enable the MVS explorer. components @@ -982,7 +982,7 @@ How we want to verify SSL certificates of services. Valid values are: Check this option to enable the USS explorer - Check this option to enable the USS explorer + Check this option to enable the USS explorer. components @@ -992,8 +992,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 @@ -1149,7 +1149,7 @@ How we want to verify SSL certificates of services. Valid values are: - This install option is only for convenience build. Check this option to enable this run step with the zwe install command. + 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. From 60d8faeca94505019a34788e36295d96be2ca7f9 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Thu, 18 Jul 2024 16:30:15 +0000 Subject: [PATCH 07/17] Promote PTF after release v2.17.0 Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index f9cd37ddc0..e65ef7390f 100644 --- 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 index a2f51e8eaf..b0196523e5 100644 --- 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 index 2930ab1572..e5d2bfc0ca 100644 --- 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 index 0e1d192cd2..a3922dcc47 100644 --- 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 index b63d0823e2..d148b2abef 100644 --- 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 \ No newline at end of file From d76ac6f9ca5d193d6a6aac167d96e87df8e7134b Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 18 Jul 2024 13:28:11 -0400 Subject: [PATCH 08/17] update manifest to create 2.18 staging builds Signed-off-by: MarkAckert --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 854288128e..cbd43cd090 100644 --- 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", From 8179ef206607bd7d06666a35ef7c0186e582b39d Mon Sep 17 00:00:00 2001 From: James Struga Date: Tue, 23 Jul 2024 21:41:55 -0400 Subject: [PATCH 09/17] Switch launcher path to point to staging Signed-off-by: James Struga --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index d8b2346603..9b3c54f218 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -120,7 +120,7 @@ "artifact": "*.pax" }, "org.zowe.launcher": { - "version": "^2.0.0-SNAPSHOT" + "version": "^2.0.0-STAGING" }, "org.zowe.keyring-utilities": { "version": "1.0.4", From 07b929e02b1a20dc256b806ab35c055273faa61a Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Wed, 24 Jul 2024 10:23:53 -0400 Subject: [PATCH 10/17] Backport fixes in v2.x/master to v2.x/staging (#3923) --- .../manifest_verification/check_sources.js | 19 +++++++++++-------- .../manifest_verification/package-lock.json | 2 +- example-zowe.yaml | 10 +++++----- files/defaults.yaml | 16 ++++++++-------- schemas/zowe-yaml-schema.json | 14 +++++++------- smpe/bld/service/ptf-bucket.txt | 2 +- 6 files changed, 33 insertions(+), 30 deletions(-) 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/example-zowe.yaml b/example-zowe.yaml index 46c20f195a..1f8a36c801 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/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/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 071b908aaf..4601706c51 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." } } diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index d148b2abef..11868e20ab 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -24,4 +24,4 @@ #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 - Thu Jul 18 16:30:14 UTC 2024 -UO90061 UO90062 - IO29431 IO29432 IO29433 \ No newline at end of file +UO90061 UO90062 - IO29431 IO29432 IO29433 From 1f9ad776820f62672d7b3e17d64ef8b9b0569332 Mon Sep 17 00:00:00 2001 From: ManjuVNair133 <160747386+ManjuVNair133@users.noreply.github.com> Date: Wed, 31 Jul 2024 17:19:09 +0530 Subject: [PATCH 11/17] Rename ssh host name (#3927) Signed-off-by: ManjuVNair133 --- playbooks/host_vars/tvt4188.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 83b086fc6ee5071027e35fda9f4a92e83a362897 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:45:58 +0200 Subject: [PATCH 12/17] Clean up for crashing java (#3931) Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- bin/commands/support/verify-fingerprints/index.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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:" From 0c2c64e677e168dcfb65adb9ab6b6f59038633e8 Mon Sep 17 00:00:00 2001 From: Mark Ackert <35308966+MarkAckert@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:48:14 -0400 Subject: [PATCH 13/17] update safkeyring schema (#3928) Signed-off-by: MarkAckert --- schemas/zowe-yaml-schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 4601706c51..deadae3492 100644 --- 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", From 6acc8e2c8bbbb9933915bb5d1cc5c96a1da89146 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Mon, 12 Aug 2024 17:17:47 +0200 Subject: [PATCH 14/17] Use correct parameters (#3929) Signed-off-by: Martin Zeithaml --- bin/libs/zosmf.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/libs/zosmf.ts b/bin/libs/zosmf.ts index 89bddfa108..949c0eddf6 100644 --- 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 From a4ff599babf7e648e521517d665fb4df5c56cba5 Mon Sep 17 00:00:00 2001 From: pavelzlatnik <45940302+pavelzlatnik@users.noreply.github.com> Date: Wed, 14 Aug 2024 15:33:52 +0200 Subject: [PATCH 15/17] NONRLS vsam mode if variable not initialized (#3935) Signed-off-by: pz636264 --- workflows/files/ZWECONF.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index 183af7feb5..5d725d8adf 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -1848,7 +1848,11 @@ echo ' # VSAM configurations if you are using VSAM as Caching Service storage echo ' vsam:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # VSAM data set with Record-Level-Sharing enabled or not' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Valid values could be: NONRLS or RLS.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +#if (${instance-zowe_setup_vsam_mode}) echo ' mode: $!{instance-zowe_setup_vsam_mode}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +#else +echo ' mode: NONRLS' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +#end echo ' # Volume name if you are using VSAM in NONRLS mode' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' volume: "$!{instance-zowe_setup_vsam_volume}"' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' # Storage class name if you are using VSAM in RLS mode' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" From b6911acc5fcccc8dd776c3e6878c49a930af58e4 Mon Sep 17 00:00:00 2001 From: John Mertic Date: Wed, 14 Aug 2024 14:31:06 -0500 Subject: [PATCH 16/17] Add DigitalOcean sponsorship link - per guidelines for credits (#3940) * Add DigitalOcean sponsorship link - per guidelines for credits Signed-off-by: John Mertic * Fix link Signed-off-by: John Mertic --------- Signed-off-by: John Mertic --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index ff5b649cb5..d6e491fd59 100644 --- a/README.md +++ b/README.md @@ -192,3 +192,10 @@ Please check details in [playbooks folder](playbooks/README.md). ## Quick Sanity Check on Your Zowe Instance Please check details in [sanity test folder](tests/sanity/README.md). + +

Hosting infrastructure for this project is supported by:

+

+ + + +

From f28ac11d57118c15c49d62ca972ff36ffbbaad26 Mon Sep 17 00:00:00 2001 From: zowe-robot <42546701+zowe-robot@users.noreply.github.com> Date: Tue, 27 Aug 2024 11:35:53 -0400 Subject: [PATCH 17/17] Promote PTF after release v2.18.0 (#3954) Signed-off-by: zowe-robot --- smpe/bld/service/promoted-apar.txt | 3 ++ smpe/bld/service/promoted-close.txt | 45 +++++++++++++++++++++++++++++ smpe/bld/service/promoted-hold.txt | 25 ++++++++++++++++ smpe/bld/service/promoted-ptf.txt | 2 ++ smpe/bld/service/ptf-bucket.txt | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt index e65ef7390f..df37f324c7 100644 --- a/smpe/bld/service/promoted-apar.txt +++ b/smpe/bld/service/promoted-apar.txt @@ -1,3 +1,6 @@ +IO29431 +IO29432 +IO29433 IO29428 IO29429 IO29430 diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt index b0196523e5..49972ae814 100644 --- a/smpe/bld/service/promoted-close.txt +++ b/smpe/bld/service/promoted-close.txt @@ -1,3 +1,48 @@ + IO29431 - + 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.18.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/ + + IO29432 - + 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.18.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/ + + IO29433 - + 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.18.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/ + IO29428 - PROBLEM SUMMARY: **************************************************************** diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt index e5d2bfc0ca..2974e256e5 100644 --- a/smpe/bld/service/promoted-hold.txt +++ b/smpe/bld/service/promoted-hold.txt @@ -1,3 +1,28 @@ +++HOLD(UO90061) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24240) + 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(UO90059) SYSTEM FMID(AZWE002) REASON(ACTION) DATE(24200) COMMENT( **************************************************************** diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt index a3922dcc47..c76a55c053 100644 --- a/smpe/bld/service/promoted-ptf.txt +++ b/smpe/bld/service/promoted-ptf.txt @@ -1,3 +1,5 @@ +UO90061 +UO90062 UO90059 UO90060 UO90057 diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt index 11868e20ab..3118f3182e 100644 --- a/smpe/bld/service/ptf-bucket.txt +++ b/smpe/bld/service/ptf-bucket.txt @@ -24,4 +24,4 @@ #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 - Thu Jul 18 16:30:14 UTC 2024 -UO90061 UO90062 - IO29431 IO29432 IO29433 +#UO90061 UO90062 - IO29431 IO29432 IO29433 - Tue Aug 27 14:35:44 UTC 2024