From 3eccda6837ccc00a4660a5ceb28a7590cb5a41eb Mon Sep 17 00:00:00 2001 From: pz636264 Date: Tue, 9 Jul 2024 12:50:04 +0200 Subject: [PATCH 01/46] 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/46] 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/46] 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/46] 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/46] 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/46] 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/46] 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/46] 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/46] 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/46] 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/46] 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/46] 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/46] 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/46] 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/46] 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/46] 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 cdfd3f2e9f75fff6e777642969d501b4b3b2b2fe Mon Sep 17 00:00:00 2001 From: mm667937 Date: Tue, 27 Aug 2024 14:27:43 +0200 Subject: [PATCH 17/46] Added script that tests the workflow by registering it Now testing the configuration workflow that is only in PSWI Signed-off-by: mm667937 --- pswi/05_test.sh | 93 +++---------------------------------- pswi/scripts/wf_run_test.sh | 88 +++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 86 deletions(-) create mode 100755 pswi/scripts/wf_run_test.sh diff --git a/pswi/05_test.sh b/pswi/05_test.sh index 523458b3c3..4cf3682ad0 100644 --- a/pswi/05_test.sh +++ b/pswi/05_test.sh @@ -60,91 +60,6 @@ sh scripts/submit_jcl.sh "`cat JCL`" if [ $? -gt 0 ];then exit -1;fi rm JCL - -if [ "$ZOSMF_V" = "2.4" ]; then - echo "Not covering deployment on z/OSMF 2.4 yet." -#TODO: it's same as for 2.3 without work zfs - manage this in deploy_test_2_3.py and add api call to register PSWI -# z/OSMF 2.4 - -# Delete Portable Software Instance if it already exists -# No check of return code because if it does not exist the script would fail (return code 404) -#echo 'Invoking REST API to delete the portable software instance if the previous test did not delete it.' -# -#RESP=`curl -s ${BASE_URL}/zosmf/swmgmt/pswi/${ZOSMF_SYSTEM}/${PSWI} -k -X "DELETE" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS ` -# -## The response is in format "statusurl":"https:\/\/:ZOSMF_URL:post\/restofurl" -#echo 'Invoking REST API to register a Portable Software Instance' -# -#RESP=`curl -s ${BASE_URL}/zosmf/swmgmt/pswi -k -X "POST" -d "$NEW_PSWI_JSON" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS ` -#sh scripts/check_response.sh "${RESP}" $? -#if [ $? -gt 0 ];then exit -1;fi -# -#EXPORT_STATUS_URL=`echo $RESP | grep -o '"statusurl":".*"' | cut -f4 -d\" | tr -d '\' 2>/dev/null` -#if [ "$EXPORT_STATUS_URL" == "" ] -#then -# echo "No response from the REST API call." -# exit -1 -#fi -# -#STATUS="" -#until [ "$STATUS" == "complete" ] -#do -#RESP=`curl -s $EXPORT_STATUS_URL -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS` -#sh scripts/check_response.sh "${RESP}" $? -#if [ $? -gt 0 ];then exit -1;fi -# -#STATUS=`echo $RESP | grep -o '"status":".*"' | cut -f4 -d\"` -#echo "The status is: "$STATUS -# -#if [ "$STATUS" != "complete" ] && [ "$STATUS" != "running" ] -#then -# echo "Registration of PSWI in z/OSMF failed." -# exit -1 -#fi -#sleep 3 -#done -# -#google-chrome --version -#RC=$? -# -#if [ $RC -gt 0 ]; -#then -#echo "Checking if the system is CentOS or RHEL." -#yum version -#RC=$? -# -#if [ $RC -gt 0 ]; -#then -# echo "Installing Chrome on Debian/Ubuntu." -# wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -# sudo apt-get install ./google-chrome-stable_current_*.rpm -#else -# echo "Installing Chrome on CentOS or RHEL." -# wget https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm -# sudo yum install ./google-chrome-stable_current_*.rpm -#fi -#fi -# -#echo "Downloading Chromedriver" -#version=`google-chrome --product-version` -#url="https://chromedriver.storage.googleapis.com/"${version}"/chromedriver_linux64.zip" -#rm chromedriver.zip -#rm chromedriver -#wget $url -nc -O chromedriver.zip -# -## Run the deployment test -#echo " Running the deployment test for z/OSMF version 2.4" -#DIR=`pwd` -#PATH=$DIR/scripts/spool_files.sh:$PATH -#pip install selenium -#pip install requests -# -#export HEADLESS="true" -#python ../PSI_testing/deploy_test.py -# -#rm chromedriver - -else # z/OSMF 2.3 # Check if work zFS for PSWI is mounted @@ -158,4 +73,10 @@ echo " Running the deployment test for z/OSMF version 2.3" pip install requests python scripts/deploy_test_2_3.py -fi +echo "Mounting ${TEST_ZFS}" +sh scripts/tmp_mounts.sh "${TEST_ZFS}" "${TEST_MOUNT}" +if [ $? -gt 0 ];then exit -1;fi + +echo "Registering/testing the configuration workflow ${TEST_HLQ}.WORKFLOW(ZWECONF)" +sh scripts/wf_run_test.sh "${TEST_HLQ}.WORKFLOW(ZWECONF)" +if [ $? -gt 0 ];then exit -1;fi diff --git a/pswi/scripts/wf_run_test.sh b/pswi/scripts/wf_run_test.sh new file mode 100755 index 0000000000..5987aeef41 --- /dev/null +++ b/pswi/scripts/wf_run_test.sh @@ -0,0 +1,88 @@ +#!/bin/sh +#version=1.0 + +export BASE_URL="${ZOSMF_URL}:${ZOSMF_PORT}" +WF_DEF_FILE=$1 +run=$2 + +echo "" +echo "" +echo "Script for testing workflow and if specified running with defaults as well..." +echo "Host :" $ZOSMF_URL +echo "Port :" $ZOSMF_PORT +echo "z/OSMF system :" $ZOSMF_SYSTEM +echo "Workflow definition file :" $WF_DEF_FILE + +WF_NAME="Testing workflows" +# URLs +CREATE_WF_URL="${BASE_URL}/zosmf/workflow/rest/1.0/workflows" +WF_LIST_URL="${BASE_URL}/zosmf/workflow/rest/1.0/workflows?owner=${ZOSMF_USER}&workflowName=${WF_NAME}" + +# JSONs + +ADD_WORKFLOW_JSON='{"workflowName":"'$WF_NAME'", +"workflowDefinitionFile":"'${WF_DEF_FILE}'", +"system":"'$ZOSMF_SYSTEM'", +"owner":"'$ZOSMF_USER'", +"assignToOwner" :true}' + +# Get workflowKey for the workflow owned by user +echo "Get workflowKey for the workflow if it exists." + +RESP=`curl -s $WF_LIST_URL -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS` +WFKEY=`echo $RESP | grep -o '"workflowKey":".*"' | cut -f4 -d\"` + +if [ -n "$WFKEY" ] +then +WORKFLOW_URL="${CREATE_WF_URL}/${WFKEY}" + +echo "Deleting the workflow." +RESP=`curl -s $WORKFLOW_URL -k -X "DELETE" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS` +sh scripts/check_response.sh "${RESP}" $? +fi + +set -ex +# Create workflow with REST API +echo 'Invoking REST API to create the workflow.' + +RESP=`curl -s $CREATE_WF_URL -k -X "POST" -d "$ADD_WORKFLOW_JSON" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS` +sh scripts/check_response.sh "${RESP}" $? +if [ $? -gt 0 ];then exit -1;fi +WFKEY=`echo $RESP | grep -o '"workflowKey":".*"' | cut -f4 -d\"` +WORKFLOW_URL="${CREATE_WF_URL}/${WFKEY}" + +if [ -n "${run}" ] +then +# Run workflow +echo "Invoking REST API to start the workflow." + +RESP=`curl -s ${WORKFLOW_URL}/operations/start -k -X "PUT" -d "{}" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS` +sh scripts/check_response.sh "${RESP}" $? +if [ $? -gt 0 ];then exit -1;fi +STATUS="" +until [ "$STATUS" = "FINISHED" ] +do +sleep 20 + + +# Get the result of the workflow +RESP=`curl -s ${WORKFLOW_URL} -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS` +if [ $? -gt 0 ];then exit -1;fi +STATUS_NAME=`echo $RESP | grep -o '"statusName":".*"' | cut -f4 -d\"` + +if [ "$STATUS_NAME" = "in-progress" ] +then + echo "Workflow ended with an error." + echo $RESP + exit -1 +elif [ "$STATUS_NAME" = "complete" ] +then + echo "Workflow finished successfully." + STATUS="FINISHED" +fi +done +fi + +echo "Deleting the workflow." +RESP=`curl -s $WORKFLOW_URL -k -X "DELETE" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS` +sh scripts/check_response.sh "${RESP}" $? From 34764fc803fbbb5f3c32973f141f1241ee9c5317 Mon Sep 17 00:00:00 2001 From: mm667937 Date: Tue, 27 Aug 2024 15:48:46 +0200 Subject: [PATCH 18/46] wrong variable for zFS Signed-off-by: mm667937 --- pswi/05_test.sh | 4 ++-- pswi/scripts/tmp_mounts.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pswi/05_test.sh b/pswi/05_test.sh index 4cf3682ad0..d43321a32d 100644 --- a/pswi/05_test.sh +++ b/pswi/05_test.sh @@ -73,8 +73,8 @@ echo " Running the deployment test for z/OSMF version 2.3" pip install requests python scripts/deploy_test_2_3.py -echo "Mounting ${TEST_ZFS}" -sh scripts/tmp_mounts.sh "${TEST_ZFS}" "${TEST_MOUNT}" +echo "Mounting ${TEST_HLQ}.ZFS" +sh scripts/tmp_mounts.sh "${TEST_HLQ}.ZFS" "${TEST_MOUNT}" if [ $? -gt 0 ];then exit -1;fi echo "Registering/testing the configuration workflow ${TEST_HLQ}.WORKFLOW(ZWECONF)" diff --git a/pswi/scripts/tmp_mounts.sh b/pswi/scripts/tmp_mounts.sh index c2e5f89370..23fa144cdb 100644 --- a/pswi/scripts/tmp_mounts.sh +++ b/pswi/scripts/tmp_mounts.sh @@ -44,7 +44,7 @@ fi if [ "$MOUNTED" = false ] then # Check if data set exists - echo "Checking if temporary zFS ${TMP_ZFS} exists." + echo "Checking if temporary zFS ${ZFS} exists." RESP=`curl -s "${BASE_URL}/zosmf/restfiles/ds?dslevel=${ZFS}" -k -X "GET" -H "Content-Type: application/json" -H "X-CSRF-ZOSMF-HEADER: A" --user $ZOSMF_USER:$ZOSMF_PASS` sh scripts/check_response.sh "${RESP}" $? if [ $? -gt 0 ];then exit -1;fi @@ -61,7 +61,7 @@ then #TODO: also check the first dsname because it can be something that just has tmp_zfs as HLQ echo fi - # Mount zFS to TMP_MOUNT + # Mount zFS to MOUNT echo "Mounting zFS ${ZFS} to ${MOUNT} mount point with JCL because REST API doesn't allow AGGRGROW parm." echo ${JOBST1} > JCL 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 19/46] 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 From 2028278687a817dec6a13c34d965572698192f57 Mon Sep 17 00:00:00 2001 From: mm667937 Date: Wed, 28 Aug 2024 10:54:05 +0200 Subject: [PATCH 20/46] testing USS workflow Signed-off-by: mm667937 --- pswi/05_test.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pswi/05_test.sh b/pswi/05_test.sh index d43321a32d..d6dcee10cd 100644 --- a/pswi/05_test.sh +++ b/pswi/05_test.sh @@ -80,3 +80,7 @@ if [ $? -gt 0 ];then exit -1;fi echo "Registering/testing the configuration workflow ${TEST_HLQ}.WORKFLOW(ZWECONF)" sh scripts/wf_run_test.sh "${TEST_HLQ}.WORKFLOW(ZWECONF)" if [ $? -gt 0 ];then exit -1;fi + +echo "Registering/testing the configuration workflow ${TEST_MOUNT}/content/files/workflows/ZWECONF.xml" +sh scripts/wf_run_test.sh "${TEST_MOUNT}/content/files/workflows/ZWECONF.xml" +if [ $? -gt 0 ];then exit -1;fi From 653219e0dfc1a805f269d626829ffd2d868c430d Mon Sep 17 00:00:00 2001 From: mm667937 Date: Wed, 28 Aug 2024 14:06:06 +0200 Subject: [PATCH 21/46] wrong path Signed-off-by: mm667937 --- pswi/05_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pswi/05_test.sh b/pswi/05_test.sh index d6dcee10cd..079ba78efc 100644 --- a/pswi/05_test.sh +++ b/pswi/05_test.sh @@ -82,5 +82,5 @@ sh scripts/wf_run_test.sh "${TEST_HLQ}.WORKFLOW(ZWECONF)" if [ $? -gt 0 ];then exit -1;fi echo "Registering/testing the configuration workflow ${TEST_MOUNT}/content/files/workflows/ZWECONF.xml" -sh scripts/wf_run_test.sh "${TEST_MOUNT}/content/files/workflows/ZWECONF.xml" +sh scripts/wf_run_test.sh "${TEST_MOUNT}/files/workflows/ZWECONF.xml" if [ $? -gt 0 ];then exit -1;fi From 84749f06102095c67cde4f007a17af140a8cef49 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 28 Aug 2024 13:53:35 -0400 Subject: [PATCH 22/46] bump to 2.18.1 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 f015fdc74f..be11c98858 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "2.18.0", + "version": "2.18.1", "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 90f76d28ed007d396b4f8aaedf655d80d60f7e87 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 09:35:59 -0400 Subject: [PATCH 23/46] update v3 containers with newer node and java Signed-off-by: MarkAckert --- containers/base-jdk/ubi/Dockerfile | 22 ++--- containers/base-jdk/ubuntu/Dockerfile | 32 ++++--- containers/base-node/Dockerfile | 12 +-- containers/base/ubi/Dockerfile | 116 +++++++++++------------ containers/base/ubuntu/Dockerfile | 127 +++++++++++++------------- 5 files changed, 156 insertions(+), 153 deletions(-) diff --git a/containers/base-jdk/ubi/Dockerfile b/containers/base-jdk/ubi/Dockerfile index b87b254888..5aeaf99f10 100644 --- a/containers/base-jdk/ubi/Dockerfile +++ b/containers/base-jdk/ubi/Dockerfile @@ -14,18 +14,18 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubi ################################## # labels LABEL name="Zowe Base Image with JDK enabled" \ - maintainer="jack-tiefeng.jia@ibm.com" \ - vendor="Zowe" \ - version="2.0.2" \ - release="0" \ - summary="Base image for Zowe components with JDK enabled" \ - description="Base image for Zowe components with JDK enabled" + maintainer="mark.ackert@broadcom.com" \ + vendor="Zowe" \ + version="3.0.0" \ + release="0" \ + summary="Base image for Zowe components with JDK enabled" \ + description="Base image for Zowe components with JDK enabled" ################################## # Install JDK RUN microdnf install --nodocs \ - java-1.8.0-openjdk \ - && microdnf clean all --enablerepo='*' \ - # smoke tests - && java -version -ENV JAVA_HOME=/usr/lib/jvm/jre-1.8.0 + java-1.11.0-openjdk \ + && microdnf clean all --enablerepo='*' \ + # smoke tests + && java -version +ENV JAVA_HOME=/usr/lib/jvm/jre-1.11.0 diff --git a/containers/base-jdk/ubuntu/Dockerfile b/containers/base-jdk/ubuntu/Dockerfile index 3ce76a688a..a12017b825 100644 --- a/containers/base-jdk/ubuntu/Dockerfile +++ b/containers/base-jdk/ubuntu/Dockerfile @@ -14,19 +14,23 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubuntu ################################## # labels LABEL name="Zowe Base Image with JDK enabled" \ - maintainer="jack-tiefeng.jia@ibm.com" \ - vendor="Zowe" \ - version="2.0.2" \ - release="0" \ - summary="Base image for Zowe components with JDK enabled" \ - description="Base image for Zowe components with JDK enabled" + maintainer="mark.ackert@broadcom.com" \ + vendor="Zowe" \ + version="3.0.0" \ + release="0" \ + summary="Base image for Zowe components with JDK enabled" \ + description="Base image for Zowe components with JDK enabled" ################################## -# Install JDK -RUN apt-get update \ - && apt-get install -y \ - openjdk-8-jre \ - && rm -rf /var/lib/apt/lists/* \ - # smoke tests - && java -version -ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre + +# Install JDK. We manually add apt sources to avoid installing python, which is required for add-apt-repository. +RUN CODENAME=$(cat /etc/os-release | grep UBUNTU_CODENAME | cut -d "=" -f 2) \ + && echo deb [trusted=yes] https://ppa.launchpadcontent.net/openjdk-r/ppa/ubuntu "$CODENAME" main >> /etc/apt/sources.list \ + && echo deb-src [trusted=yes] https://ppa.launchpadcontent.net/openjdk-r/ppa/ubuntu "$CODENAME" main >> /etc/apt/sources.list \ + && apt-get update \ + && apt-get install -y \ + openjdk-11-jre \ + && rm -rf /var/lib/apt/lists/* \ + # smoke tests + && java -version +ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/jre diff --git a/containers/base-node/Dockerfile b/containers/base-node/Dockerfile index e3cd778ccd..4ead448b79 100644 --- a/containers/base-node/Dockerfile +++ b/containers/base-node/Dockerfile @@ -17,12 +17,12 @@ FROM zowe-docker-release.jfrog.io/ompzowe/base:${ZOWE_BASE_IMAGE} ################################## # labels LABEL name="Zowe Base Image with node.js enabled" \ - maintainer="jack-tiefeng.jia@ibm.com" \ - vendor="Zowe" \ - version="2.0.2" \ - release="0" \ - summary="Base image for Zowe components with node.js enabled" \ - description="Base image for Zowe components with node.js enabled" + maintainer="mark.ackert@broadcom.com" \ + vendor="Zowe" \ + version="3.0.0" \ + release="0" \ + summary="Base image for Zowe components with node.js enabled" \ + description="Base image for Zowe components with node.js enabled" ################################## # node.js is installed in base image, so no actions here diff --git a/containers/base/ubi/Dockerfile b/containers/base/ubi/Dockerfile index 1c7faf2def..99a7975d5d 100644 --- a/containers/base/ubi/Dockerfile +++ b/containers/base/ubi/Dockerfile @@ -14,12 +14,12 @@ FROM registry.redhat.io/ubi8/ubi-minimal:latest ################################## # labels LABEL name="Zowe Base Image" \ - maintainer="jack-tiefeng.jia@ibm.com" \ - vendor="Zowe" \ - version="2.0.2" \ - release="0" \ - summary="Base image for Zowe components" \ - description="Base image for Zowe components" + maintainer="mark.ackert@broadcom.com" \ + vendor="Zowe" \ + version="3.0.0" \ + release="0" \ + summary="Base image for Zowe components" \ + description="Base image for Zowe components" ################################## # arguments @@ -32,59 +32,59 @@ ARG NODE_CPU_ARCH=x64 ################################## # environments -ENV NODE_VERSION=16.18.1 +ENV NODE_VERSION=18.20.4 ################################## # customize RUN set -ex \ - # shadow-utils is needed for having adduser groupadd commands - && microdnf install --nodocs shadow-utils \ - # define zowe user/group - && groupadd --gid ${GID} zowe \ - && useradd -r -m --no-log-init --uid ${UID} --gid ${GID} --home /home/zowe zowe \ - # create /licenses folder - && mkdir -p /licenses \ - && chown zowe.zowe /licenses \ - # create /component folder - && mkdir -p /component \ - && chown zowe.zowe /component \ - # install node.js which is mandatory for now - && microdnf install --nodocs \ - findutils \ - tar \ - xz \ - && ARCH=${NODE_CPU_ARCH} \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ - done \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version \ - # remove unused pacakges - && microdnf remove \ - findutils \ - tar \ - xz \ - # clean up - && microdnf clean all --enablerepo='*' + # shadow-utils is needed for having adduser groupadd commands + && microdnf install --nodocs shadow-utils \ + # define zowe user/group + && groupadd --gid ${GID} zowe \ + && useradd -r -m --no-log-init --uid ${UID} --gid ${GID} --home /home/zowe zowe \ + # create /licenses folder + && mkdir -p /licenses \ + && chown zowe.zowe /licenses \ + # create /component folder + && mkdir -p /component \ + && chown zowe.zowe /component \ + # install node.js which is mandatory for now + && microdnf install --nodocs \ + findutils \ + tar \ + xz \ + && ARCH=${NODE_CPU_ARCH} \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version \ + # remove unused pacakges + && microdnf remove \ + findutils \ + tar \ + xz \ + # clean up + && microdnf clean all --enablerepo='*' diff --git a/containers/base/ubuntu/Dockerfile b/containers/base/ubuntu/Dockerfile index 232f9b5824..a8b0c96819 100644 --- a/containers/base/ubuntu/Dockerfile +++ b/containers/base/ubuntu/Dockerfile @@ -14,12 +14,12 @@ FROM ubuntu:latest ################################## # labels LABEL name="Zowe Base Image" \ - maintainer="jack-tiefeng.jia@ibm.com" \ - vendor="Zowe" \ - version="2.0.2" \ - release="0" \ - summary="Base image for Zowe components" \ - description="Base image for Zowe components" + maintainer="mark.ackert@broadcom.com" \ + vendor="Zowe" \ + version="3.0.0" \ + release="0" \ + summary="Base image for Zowe components" \ + description="Base image for Zowe components" ################################## # arguments @@ -32,65 +32,64 @@ ARG NODE_CPU_ARCH=x64 ################################## # environments -ENV NODE_VERSION=16.18.1 +ENV NODE_VERSION=18.20.4 ################################## # customize RUN set -ex \ - # define zowe user/group - && groupadd -g $GID -r zowe \ - && useradd -r -m --no-log-init --uid ${UID} --gid ${GID} -d /home/zowe zowe \ - # use bash as default shell - && cd /bin \ - && ln -sfn bash sh \ - # create /licenses folder - && mkdir -p /licenses \ - && chown zowe.zowe /licenses \ - # create /component folder - && mkdir -p /component \ - && chown zowe.zowe /component \ - # install node.js which is mandatory for now - && apt-get update \ - && apt-get install -y \ - curl \ - gnupg \ - xz-utils \ - # upgrade - && apt-get upgrade -y \ - && ARCH=${NODE_CPU_ARCH} \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ - done \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version \ - # remove unused pacakges - && apt-get purge --auto-remove -y \ - bzip2 \ - curl \ - gnupg \ - tini \ - xz-utils \ - # clean up - && rm -rf /var/lib/apt/lists/* + # define zowe user/group + && groupadd -g $GID -r zowe \ + && useradd -r -m --no-log-init --uid ${UID} --gid ${GID} -d /home/zowe zowe \ + # use bash as default shell + && cd /bin \ + && ln -sfn bash sh \ + # create /licenses folder + && mkdir -p /licenses \ + && chown zowe.zowe /licenses \ + # create /component folder + && mkdir -p /component \ + && chown zowe.zowe /component \ + # install node.js which is mandatory for now + && apt-get update \ + && apt-get install -y \ + curl \ + gnupg \ + xz-utils \ + # upgrade + && apt-get upgrade -y \ + && ARCH=${NODE_CPU_ARCH} \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version \ + # remove unused pacakges + && apt-get purge --auto-remove -y \ + bzip2 \ + curl \ + gnupg \ + tini \ + xz-utils \ + # clean up + && rm -rf /var/lib/apt/lists/* From dbeb0130d98244370326ccd1a46bf97b12826f32 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 11:11:20 -0400 Subject: [PATCH 24/46] update node gpg keys in ubi Signed-off-by: MarkAckert --- containers/base/ubi/Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/containers/base/ubi/Dockerfile b/containers/base/ubi/Dockerfile index 99a7975d5d..51a4753b90 100644 --- a/containers/base/ubi/Dockerfile +++ b/containers/base/ubi/Dockerfile @@ -57,16 +57,15 @@ RUN set -ex \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ From e42c2b6becc62177ac83864a8f52dbf906f05379 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 11:24:31 -0400 Subject: [PATCH 25/46] update java 11 package for ubi Signed-off-by: MarkAckert --- containers/base-jdk/ubi/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/base-jdk/ubi/Dockerfile b/containers/base-jdk/ubi/Dockerfile index 5aeaf99f10..4f06e8c2cd 100644 --- a/containers/base-jdk/ubi/Dockerfile +++ b/containers/base-jdk/ubi/Dockerfile @@ -24,7 +24,7 @@ LABEL name="Zowe Base Image with JDK enabled" \ ################################## # Install JDK RUN microdnf install --nodocs \ - java-1.11.0-openjdk \ + java-1.11.0-openjdk-headless \ && microdnf clean all --enablerepo='*' \ # smoke tests && java -version From f753997ee39d7fddb57ad77124305d64758c20fc Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 12:00:54 -0400 Subject: [PATCH 26/46] fix java 11 ubi pkg Signed-off-by: MarkAckert --- containers/base-jdk/ubi/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/base-jdk/ubi/Dockerfile b/containers/base-jdk/ubi/Dockerfile index 4f06e8c2cd..34f6ca3d4e 100644 --- a/containers/base-jdk/ubi/Dockerfile +++ b/containers/base-jdk/ubi/Dockerfile @@ -24,7 +24,7 @@ LABEL name="Zowe Base Image with JDK enabled" \ ################################## # Install JDK RUN microdnf install --nodocs \ - java-1.11.0-openjdk-headless \ + java-11-openjdk-headless \ && microdnf clean all --enablerepo='*' \ # smoke tests && java -version From d802887121feec32efdb8e0caa98e75b99171f85 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 13:42:31 -0400 Subject: [PATCH 27/46] use majorVersion in docker FROM statements Signed-off-by: MarkAckert --- containers/base-jdk/ubi/Dockerfile | 2 +- containers/base-jdk/ubuntu/Dockerfile | 2 +- containers/base-node/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containers/base-jdk/ubi/Dockerfile b/containers/base-jdk/ubi/Dockerfile index 34f6ca3d4e..153207d490 100644 --- a/containers/base-jdk/ubi/Dockerfile +++ b/containers/base-jdk/ubi/Dockerfile @@ -9,7 +9,7 @@ # Copyright Contributors to the Zowe Project. ####################################################################### -FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubi +FROM zowe-docker-release.jfrog.io/ompzowe/base:3-ubi ################################## # labels diff --git a/containers/base-jdk/ubuntu/Dockerfile b/containers/base-jdk/ubuntu/Dockerfile index a12017b825..c061a0bc07 100644 --- a/containers/base-jdk/ubuntu/Dockerfile +++ b/containers/base-jdk/ubuntu/Dockerfile @@ -9,7 +9,7 @@ # Copyright Contributors to the Zowe Project. ####################################################################### -FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubuntu +FROM zowe-docker-release.jfrog.io/ompzowe/base:3-ubuntu ################################## # labels diff --git a/containers/base-node/Dockerfile b/containers/base-node/Dockerfile index 4ead448b79..089a4c7af0 100644 --- a/containers/base-node/Dockerfile +++ b/containers/base-node/Dockerfile @@ -10,7 +10,7 @@ ####################################################################### # base image tag -ARG ZOWE_BASE_IMAGE=latest-ubuntu +ARG ZOWE_BASE_IMAGE=3-ubuntu FROM zowe-docker-release.jfrog.io/ompzowe/base:${ZOWE_BASE_IMAGE} From 02c10464c4f9f810c795464d4baa5311a800485e Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 13:43:58 -0400 Subject: [PATCH 28/46] container builds use in FROM statements Signed-off-by: MarkAckert --- containers/base-jdk/ubi/Dockerfile | 2 +- containers/base-jdk/ubuntu/Dockerfile | 2 +- containers/base-node/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containers/base-jdk/ubi/Dockerfile b/containers/base-jdk/ubi/Dockerfile index b87b254888..e4618a38bb 100644 --- a/containers/base-jdk/ubi/Dockerfile +++ b/containers/base-jdk/ubi/Dockerfile @@ -9,7 +9,7 @@ # Copyright Contributors to the Zowe Project. ####################################################################### -FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubi +FROM zowe-docker-release.jfrog.io/ompzowe/base:2-ubi ################################## # labels diff --git a/containers/base-jdk/ubuntu/Dockerfile b/containers/base-jdk/ubuntu/Dockerfile index 3ce76a688a..bdb950bbc6 100644 --- a/containers/base-jdk/ubuntu/Dockerfile +++ b/containers/base-jdk/ubuntu/Dockerfile @@ -9,7 +9,7 @@ # Copyright Contributors to the Zowe Project. ####################################################################### -FROM zowe-docker-release.jfrog.io/ompzowe/base:latest-ubuntu +FROM zowe-docker-release.jfrog.io/ompzowe/base:2-ubuntu ################################## # labels diff --git a/containers/base-node/Dockerfile b/containers/base-node/Dockerfile index e3cd778ccd..345a3a3118 100644 --- a/containers/base-node/Dockerfile +++ b/containers/base-node/Dockerfile @@ -10,7 +10,7 @@ ####################################################################### # base image tag -ARG ZOWE_BASE_IMAGE=latest-ubuntu +ARG ZOWE_BASE_IMAGE=2-ubuntu FROM zowe-docker-release.jfrog.io/ompzowe/base:${ZOWE_BASE_IMAGE} From 7a797ba0f29a3f54f4d8843944436dfe7b9c7d59 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 14:13:12 -0400 Subject: [PATCH 29/46] missed launch scripts Signed-off-by: MarkAckert --- containers/zowe-launch-scripts/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/zowe-launch-scripts/Dockerfile b/containers/zowe-launch-scripts/Dockerfile index 4c969ce1d7..4334923c61 100644 --- a/containers/zowe-launch-scripts/Dockerfile +++ b/containers/zowe-launch-scripts/Dockerfile @@ -10,7 +10,7 @@ ####################################################################### # base image tag -ARG ZOWE_BASE_IMAGE=latest-ubuntu +ARG ZOWE_BASE_IMAGE=2-ubuntu FROM zowe-docker-release.jfrog.io/ompzowe/base-node:${ZOWE_BASE_IMAGE} From 4550cee3be7a18cab7abfa24fb67f418412d2fcf Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 30 Aug 2024 14:14:11 -0400 Subject: [PATCH 30/46] missed launch scripts Signed-off-by: MarkAckert --- containers/zowe-launch-scripts/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/containers/zowe-launch-scripts/Dockerfile b/containers/zowe-launch-scripts/Dockerfile index 4c969ce1d7..30d28465dc 100644 --- a/containers/zowe-launch-scripts/Dockerfile +++ b/containers/zowe-launch-scripts/Dockerfile @@ -10,19 +10,19 @@ ####################################################################### # base image tag -ARG ZOWE_BASE_IMAGE=latest-ubuntu +ARG ZOWE_BASE_IMAGE=3-ubuntu FROM zowe-docker-release.jfrog.io/ompzowe/base-node:${ZOWE_BASE_IMAGE} ################################## # labels LABEL name="Zowe Launch Script Image" \ - maintainer="jack-tiefeng.jia@ibm.com" \ - vendor="Zowe" \ - version="0.0.0" \ - release="0" \ - summary="Base Launch Script for Zowe components" \ - description="Base Launch Script for Zowe components" + maintainer="mark.ackert@broadcom.com" \ + vendor="Zowe" \ + version="0.0.0" \ + release="0" \ + summary="Base Launch Script for Zowe components" \ + description="Base Launch Script for Zowe components" ################################## # switch context From 0ea7ec6600b5ca857906f3962839a4d32167730c Mon Sep 17 00:00:00 2001 From: ac892247 Date: Mon, 2 Sep 2024 13:35:52 +0200 Subject: [PATCH 31/46] use infinispan instead of vsam in tests Signed-off-by: ac892247 --- example-zowe.yaml | 11 ++++------- playbooks/all_host_vars_list.yml | 2 +- playbooks/roles/configure/defaults/main.yml | 2 +- playbooks/roles/configure/tasks/main.yml | 3 --- playbooks/roles/custom_for_test/defaults/main.yml | 2 +- playbooks/roles/custom_for_test/tasks/main.yml | 2 +- 6 files changed, 8 insertions(+), 14 deletions(-) diff --git a/example-zowe.yaml b/example-zowe.yaml index 812f46b7b5..28686eb439 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -565,17 +565,14 @@ components: storage: evictionStrategy: reject - # can be inMemory, VSAM, redis or infinispan - mode: VSAM - size: 10000 - vsam: - # your VSAM data set created by "zwe init vsam" command or ZWECSVSM JCL - # this is required if storage mode is VSAM - name: "" + # can be infinispan, inMemory, redis or VSAM(deprecated) + mode: infinispan infinispan: # this is required if storage mode is infinispan jgroups: port: 7600 + keyExchange: + port: 7601 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> app-server: diff --git a/playbooks/all_host_vars_list.yml b/playbooks/all_host_vars_list.yml index 93f9f01653..fc62ad97b5 100644 --- a/playbooks/all_host_vars_list.yml +++ b/playbooks/all_host_vars_list.yml @@ -42,7 +42,7 @@ zowe_apiml_security_zosmf_applid: IZUDFLT zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: AUTO zowe_apiml_verify_certficates_of_services: true zowe_auto_create_user_group: false -zowe_caching_service_persistent: VSAM +zowe_caching_service_persistent: infinispan zowe_caching_service_port: 7555 zowe_caching_service_vsam_dsprefix: CACHE zowe_caching_vsam_storage_class: diff --git a/playbooks/roles/configure/defaults/main.yml b/playbooks/roles/configure/defaults/main.yml index 39ad5e895f..b8f0373243 100644 --- a/playbooks/roles/configure/defaults/main.yml +++ b/playbooks/roles/configure/defaults/main.yml @@ -75,7 +75,7 @@ zowe_mvs_explorer_port: 7561 zowe_uss_explorer_port: 7562 # caching service zowe_caching_service_port: 7555 -zowe_caching_service_persistent: VSAM +zowe_caching_service_persistent: infinispan # the final data set name will be: {zowe_dataset_prefix}.{zowe_caching_service_vsam_dsprefix}{zowe_instance_id} # for example: IBMUSER.ZWE.CACHE1 zowe_caching_service_vsam_dsprefix: CACHE diff --git a/playbooks/roles/configure/tasks/main.yml b/playbooks/roles/configure/tasks/main.yml index 979fdf6e0f..36efca1f0e 100644 --- a/playbooks/roles/configure/tasks/main.yml +++ b/playbooks/roles/configure/tasks/main.yml @@ -221,10 +221,7 @@ tasks_from: update_zowe_yaml vars: configs: - "zowe.setup.vsam.volume": "{{ zowe_caching_vsam_volume }}" - "zowe.setup.vsam.storageClass": "{{ zowe_caching_vsam_storage_class }}" "components.caching-service.storage.mode": "{{ zowe_caching_service_persistent }}" - "components.caching-service.storage.vsam.name": "{{ zowe_dataset_prefix }}.{{ zowe_caching_service_vsam_dsprefix }}{{ zowe_instance_id }}" - name: Update zowe.yaml zowe.setup.vsam.mode to NONRLS import_role: diff --git a/playbooks/roles/custom_for_test/defaults/main.yml b/playbooks/roles/custom_for_test/defaults/main.yml index 5209791295..ef620cbe0d 100644 --- a/playbooks/roles/custom_for_test/defaults/main.yml +++ b/playbooks/roles/custom_for_test/defaults/main.yml @@ -74,7 +74,7 @@ zowe_mvs_explorer_port: 7561 zowe_uss_explorer_port: 7562 # caching service zowe_caching_service_port: 7555 -zowe_caching_service_persistent: VSAM +zowe_caching_service_persistent: infinispan # the final data set name will be: {zowe_dataset_prefix}.{zowe_caching_service_vsam_dsprefix}{zowe_instance_id} # for example: IBMUSER.ZWE.CACHE1 zowe_caching_service_vsam_dsprefix: CACHE diff --git a/playbooks/roles/custom_for_test/tasks/main.yml b/playbooks/roles/custom_for_test/tasks/main.yml index 4403348fad..ea85b09568 100644 --- a/playbooks/roles/custom_for_test/tasks/main.yml +++ b/playbooks/roles/custom_for_test/tasks/main.yml @@ -151,7 +151,7 @@ # ============================================================================ # Enable disabled services -- name: Update zowe.yaml zowe.setup.vsam +- name: Update zowe.yaml import_role: name: zos tasks_from: update_zowe_yaml From 634ff4f91ebbb207e58ed0f371afd1121ea6ff12 Mon Sep 17 00:00:00 2001 From: ac892247 Date: Mon, 2 Sep 2024 14:24:57 +0200 Subject: [PATCH 32/46] add infinispan to workflow Signed-off-by: ac892247 --- workflows/files/ZWECONF.xml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index f0961c356b..9af5654fb5 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -702,7 +702,7 @@ How we want to verify SSL certificates of services. Valid values are: redis infinispan VSAM - VSAM + infinispan @@ -737,6 +737,17 @@ How we want to verify SSL certificates of services. Valid values are: 7600 + + + Port for jgroups key exchange + Port for jgroups key exchange. This is required if storage mode is infinispan. + components + + + + 7601 + + Check this option to enable the app server @@ -1303,7 +1314,7 @@ How we want to verify SSL certificates of services. Valid values are: false - + Variables for Caching Service - VSAM mode Specify the variables for the VSAM mode of Caching Service @@ -1323,10 +1334,10 @@ 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 @@ -1356,6 +1367,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 @@ -2104,8 +2116,12 @@ echo ' # this is required if storage mode is infinispan' >> "${instance-z echo ' jgroups:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #if (${instance-components_caching_service_storage_mode} == "infinispan" ) echo ' port: ${instance-components_caching_service_storage_infinispan_jgroups_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' keyExchange: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' port: ${instance-components_caching_service_storage_infinispan_jgroups_keyExchange_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #else echo ' port: 7600' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' keyExchange: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' port: 7601' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end #end #if (${instance-components_caching_service_enabled} == "false" ) From a58f6d4d2fce833141f3fd456e6702ed160d84d7 Mon Sep 17 00:00:00 2001 From: ac892247 Date: Mon, 2 Sep 2024 14:30:50 +0200 Subject: [PATCH 33/46] define variable among properties Signed-off-by: ac892247 --- workflows/files/ZWECONF.properties | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/workflows/files/ZWECONF.properties b/workflows/files/ZWECONF.properties index 4eadca84d7..a1f71030b7 100644 --- a/workflows/files/ZWECONF.properties +++ b/workflows/files/ZWECONF.properties @@ -539,6 +539,14 @@ components_caching_service_storage_vsam_name= # Port for jgroups. This is required if storage mode is infinispan. components_caching_service_storage_infinispan_jgroups_port=7600 +# components_caching_service_storage_infinispan_jgroups_keyExchange_port +# Label: Caching service storage jgroups key exchange port +# Abstract: Port for jgroups key exchang +# Category: components +# Description: +# Port for jgroups key exchang. This is required if storage mode is infinispan. +components_caching_service_storage_infinispan_jgroups_keyExchange_port=7601 + # components_app_server_enabled # Label: Enable app server # Abstract: Check this option to enable the app server From c0c08a5f2d66d8bfc6bc9cb0061d0c3c65a1d2d9 Mon Sep 17 00:00:00 2001 From: ac892247 Date: Mon, 2 Sep 2024 15:28:28 +0200 Subject: [PATCH 34/46] jgroups host Signed-off-by: ac892247 --- workflows/files/ZWECONF.properties | 10 +++++++++- workflows/files/ZWECONF.xml | 13 +++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/workflows/files/ZWECONF.properties b/workflows/files/ZWECONF.properties index a1f71030b7..5859e80dbc 100644 --- a/workflows/files/ZWECONF.properties +++ b/workflows/files/ZWECONF.properties @@ -539,12 +539,20 @@ components_caching_service_storage_vsam_name= # Port for jgroups. This is required if storage mode is infinispan. components_caching_service_storage_infinispan_jgroups_port=7600 +# components_caching_service_storage_infinispan_jgroups_host +# Label: Caching service storage jgroups host +# Abstract: Host for jgroups +# Category: components +# Description: +# Host for jgroups +components_caching_service_storage_infinispan_jgroups_host= + # components_caching_service_storage_infinispan_jgroups_keyExchange_port # Label: Caching service storage jgroups key exchange port # Abstract: Port for jgroups key exchang # Category: components # Description: -# Port for jgroups key exchang. This is required if storage mode is infinispan. +# Port for jgroups key exchange. This is required if storage mode is infinispan. components_caching_service_storage_infinispan_jgroups_keyExchange_port=7601 # components_app_server_enabled diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index 9af5654fb5..de83b95f61 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -737,6 +737,17 @@ How we want to verify SSL certificates of services. Valid values are: 7600 + + + Host for jgroups + Host for jgroups. Default value is the same as Zowe host and it is used if storage mode is infinispan. + components + + + + dvipa.my-company.com + + Port for jgroups key exchange @@ -1367,6 +1378,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 @@ -2116,6 +2128,7 @@ echo ' # this is required if storage mode is infinispan' >> "${instance-z echo ' jgroups:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #if (${instance-components_caching_service_storage_mode} == "infinispan" ) echo ' port: ${instance-components_caching_service_storage_infinispan_jgroups_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' host: ${instance-components_caching_service_storage_infinispan_jgroups_host}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' keyExchange: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: ${instance-components_caching_service_storage_infinispan_jgroups_keyExchange_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #else From 54e4ec5b37307945832bcd92993d1a03ebbb3e3f Mon Sep 17 00:00:00 2001 From: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:30:21 +0200 Subject: [PATCH 35/46] Update manifest.json.template for jwt testsing Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com> --- manifest.json.template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 6194230ca9..a6dc6a5897 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -57,27 +57,27 @@ "artifact": "*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "^3.0.3-SNAPSHOT", + "version": "^3.0.22-PR-PR-3717-SNAPSHOT", "artifact": "api-catalog-*.zip", "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.discovery-package": { - "version": "^3.0.3-SNAPSHOT", + "version": "^3.0.22-PR-PR-3717-SNAPSHOT", "artifact": "discovery-*.zip", "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.gateway-package": { - "version": "^3.0.3-SNAPSHOT", + "version": "^3.0.22-PR-PR-3717-SNAPSHOT", "artifact": "gateway-*.zip", "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.caching-service-package": { - "version": "^3.0.3-SNAPSHOT", + "version": "^3.0.22-PR-PR-3717-SNAPSHOT", "artifact": "caching-service-*.zip", "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "^3.0.3-SNAPSHOT", + "version": "^3.0.22-PR-PR-3717-SNAPSHOT", "artifact": "apiml-common-lib-*.zip", "exclusions": ["*PR*.zip"] }, @@ -92,7 +92,7 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.zaas-package": { - "version": "^3.0.3-SNAPSHOT", + "version": "^3.0.22-PR-PR-3717-SNAPSHOT", "artifact": "zaas-package-*.zip", "exclusions": ["*PR*.zip"] }, From 56126e3fc8402e1a999c5777928c07fd5bedaf16 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Tue, 3 Sep 2024 15:05:31 -0400 Subject: [PATCH 36/46] add permissions to cicd-test wf Signed-off-by: MarkAckert --- .github/workflows/cicd-test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml index efa37bb2ca..6bbb222e2f 100644 --- a/.github/workflows/cicd-test.yml +++ b/.github/workflows/cicd-test.yml @@ -1,4 +1,11 @@ name: Zowe CICD Integration Tests + +permissions: + contents: write + issues: write + pull-requests: write + statuses: write + on: workflow_dispatch: inputs: From 8e2e3a28d6c2efd94d4482bc081a969138b00586 Mon Sep 17 00:00:00 2001 From: ac892247 Date: Wed, 4 Sep 2024 10:49:05 +0200 Subject: [PATCH 37/46] update zowe version in workflow Signed-off-by: ac892247 --- workflows/files/ZWECONF.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index de83b95f61..7e48e1a41b 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -3,9 +3,9 @@ true - config_zowe_20 - Configuration of Zowe 2.0 - Use this workflow to configure the Zowe 2.0 + config_zowe_30 + Configuration of Zowe 3.0 + Use this workflow to configure the Zowe 3.0 ###ZOWE_VERSION### Zowe From cb563f6634e6c7c5e1224c3252e9788c05e8ab30 Mon Sep 17 00:00:00 2001 From: ac892247 Date: Wed, 4 Sep 2024 15:13:32 +0200 Subject: [PATCH 38/46] remove default value Signed-off-by: ac892247 --- workflows/files/ZWECONF.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml index 7e48e1a41b..d6a4a93a84 100644 --- a/workflows/files/ZWECONF.xml +++ b/workflows/files/ZWECONF.xml @@ -742,12 +742,8 @@ How we want to verify SSL certificates of services. Valid values are: Host for jgroups Host for jgroups. Default value is the same as Zowe host and it is used if storage mode is infinispan. components - - - - dvipa.my-company.com - - + + Port for jgroups key exchange @@ -2133,6 +2129,7 @@ echo ' keyExchange: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: ${instance-components_caching_service_storage_infinispan_jgroups_keyExchange_port}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #else echo ' port: 7600' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" +echo ' host: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' keyExchange: ' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" echo ' port: 7601' >> "${instance-zowe_runtimeDirectory}/zowe.yaml" #end From 3382395b4b0f3440ce8ab58da0a84d6acd13d8ef Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 4 Sep 2024 11:12:14 -0400 Subject: [PATCH 39/46] update jdk to 17 Signed-off-by: MarkAckert --- containers/base-jdk/ubi/Dockerfile | 4 ++-- containers/base-jdk/ubuntu/Dockerfile | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/containers/base-jdk/ubi/Dockerfile b/containers/base-jdk/ubi/Dockerfile index 153207d490..14a2d3f4de 100644 --- a/containers/base-jdk/ubi/Dockerfile +++ b/containers/base-jdk/ubi/Dockerfile @@ -24,8 +24,8 @@ LABEL name="Zowe Base Image with JDK enabled" \ ################################## # Install JDK RUN microdnf install --nodocs \ - java-11-openjdk-headless \ + java-17-openjdk-headless \ && microdnf clean all --enablerepo='*' \ # smoke tests && java -version -ENV JAVA_HOME=/usr/lib/jvm/jre-1.11.0 +ENV JAVA_HOME=/usr/lib/jvm/jre-1.17.0 diff --git a/containers/base-jdk/ubuntu/Dockerfile b/containers/base-jdk/ubuntu/Dockerfile index c061a0bc07..dff15325e4 100644 --- a/containers/base-jdk/ubuntu/Dockerfile +++ b/containers/base-jdk/ubuntu/Dockerfile @@ -24,13 +24,10 @@ LABEL name="Zowe Base Image with JDK enabled" \ ################################## # Install JDK. We manually add apt sources to avoid installing python, which is required for add-apt-repository. -RUN CODENAME=$(cat /etc/os-release | grep UBUNTU_CODENAME | cut -d "=" -f 2) \ - && echo deb [trusted=yes] https://ppa.launchpadcontent.net/openjdk-r/ppa/ubuntu "$CODENAME" main >> /etc/apt/sources.list \ - && echo deb-src [trusted=yes] https://ppa.launchpadcontent.net/openjdk-r/ppa/ubuntu "$CODENAME" main >> /etc/apt/sources.list \ - && apt-get update \ +RUN apt-get update \ && apt-get install -y \ - openjdk-11-jre \ + openjdk-17-jre \ && rm -rf /var/lib/apt/lists/* \ # smoke tests && java -version -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/jre +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/jre From cb0a47f7979590637ffd1f5f002ac2f9897289c9 Mon Sep 17 00:00:00 2001 From: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com> Date: Wed, 4 Sep 2024 17:13:19 +0200 Subject: [PATCH 40/46] Update example-zowe.yaml Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com> --- example-zowe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example-zowe.yaml b/example-zowe.yaml index 812f46b7b5..5b6b6fb512 100644 --- a/example-zowe.yaml +++ b/example-zowe.yaml @@ -535,7 +535,7 @@ components: auth: provider: zosmf zosmf: - jwtAutoconfiguration: auto + jwtAutoconfiguration: jwt serviceId: ibmzosmf authorization: endpoint: From c4d67e606ad48d86413274083f7c46ce274fcdef Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 4 Sep 2024 11:18:27 -0400 Subject: [PATCH 41/46] cleanup comment Signed-off-by: MarkAckert --- containers/base-jdk/ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/base-jdk/ubuntu/Dockerfile b/containers/base-jdk/ubuntu/Dockerfile index dff15325e4..b5c3417d84 100644 --- a/containers/base-jdk/ubuntu/Dockerfile +++ b/containers/base-jdk/ubuntu/Dockerfile @@ -23,7 +23,7 @@ LABEL name="Zowe Base Image with JDK enabled" \ ################################## -# Install JDK. We manually add apt sources to avoid installing python, which is required for add-apt-repository. +# Install JDK. RUN apt-get update \ && apt-get install -y \ openjdk-17-jre \ From a808fd65542d7f27a3ffc476fc9cc410bcb71e11 Mon Sep 17 00:00:00 2001 From: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com> Date: Wed, 4 Sep 2024 17:24:24 +0200 Subject: [PATCH 42/46] Update defaults.yaml for jwt Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com> --- files/defaults.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/defaults.yaml b/files/defaults.yaml index 8705166e9a..30f23f5efb 100644 --- a/files/defaults.yaml +++ b/files/defaults.yaml @@ -152,8 +152,8 @@ components: auth: provider: zosmf zosmf: - jwtAutoconfiguration: auto - serviceId: zosmf + jwtAutoconfiguration: jwt + serviceId: ibmzosmf authorization: endpoint: enabled: false From 9954692f9246b004c5827e924c337896c7cfdef4 Mon Sep 17 00:00:00 2001 From: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com> Date: Wed, 4 Sep 2024 17:26:13 +0200 Subject: [PATCH 43/46] Update manifest.json.template Signed-off-by: ShobhaJayanna <36433611+Shobhajayanna@users.noreply.github.com> --- manifest.json.template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index a6dc6a5897..6194230ca9 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -57,27 +57,27 @@ "artifact": "*.pax" }, "org.zowe.apiml.api-catalog-package": { - "version": "^3.0.22-PR-PR-3717-SNAPSHOT", + "version": "^3.0.3-SNAPSHOT", "artifact": "api-catalog-*.zip", "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.discovery-package": { - "version": "^3.0.22-PR-PR-3717-SNAPSHOT", + "version": "^3.0.3-SNAPSHOT", "artifact": "discovery-*.zip", "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.gateway-package": { - "version": "^3.0.22-PR-PR-3717-SNAPSHOT", + "version": "^3.0.3-SNAPSHOT", "artifact": "gateway-*.zip", "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.caching-service-package": { - "version": "^3.0.22-PR-PR-3717-SNAPSHOT", + "version": "^3.0.3-SNAPSHOT", "artifact": "caching-service-*.zip", "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.apiml-common-lib-package": { - "version": "^3.0.22-PR-PR-3717-SNAPSHOT", + "version": "^3.0.3-SNAPSHOT", "artifact": "apiml-common-lib-*.zip", "exclusions": ["*PR*.zip"] }, @@ -92,7 +92,7 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.zaas-package": { - "version": "^3.0.22-PR-PR-3717-SNAPSHOT", + "version": "^3.0.3-SNAPSHOT", "artifact": "zaas-package-*.zip", "exclusions": ["*PR*.zip"] }, From 4e621c8b93ba1c4fb1a06815d98c85ef9a10b2c5 Mon Sep 17 00:00:00 2001 From: ac892247 Date: Thu, 5 Sep 2024 15:40:21 +0200 Subject: [PATCH 44/46] revert variables Signed-off-by: ac892247 --- playbooks/roles/configure/tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/playbooks/roles/configure/tasks/main.yml b/playbooks/roles/configure/tasks/main.yml index 36efca1f0e..979fdf6e0f 100644 --- a/playbooks/roles/configure/tasks/main.yml +++ b/playbooks/roles/configure/tasks/main.yml @@ -221,7 +221,10 @@ tasks_from: update_zowe_yaml vars: configs: + "zowe.setup.vsam.volume": "{{ zowe_caching_vsam_volume }}" + "zowe.setup.vsam.storageClass": "{{ zowe_caching_vsam_storage_class }}" "components.caching-service.storage.mode": "{{ zowe_caching_service_persistent }}" + "components.caching-service.storage.vsam.name": "{{ zowe_dataset_prefix }}.{{ zowe_caching_service_vsam_dsprefix }}{{ zowe_instance_id }}" - name: Update zowe.yaml zowe.setup.vsam.mode to NONRLS import_role: From 928dd05c830c0184e0753ed28c2839effb9b4773 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 5 Sep 2024 14:05:04 -0400 Subject: [PATCH 45/46] default to LTPA tokens in playbooks Signed-off-by: MarkAckert --- playbooks/all_host_vars_list.yml | 2 +- playbooks/roles/configfmid/defaults/main.yml | 2 +- playbooks/roles/configure/defaults/main.yml | 2 +- playbooks/roles/custom_for_test/defaults/main.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/all_host_vars_list.yml b/playbooks/all_host_vars_list.yml index fc62ad97b5..e81a000a3e 100644 --- a/playbooks/all_host_vars_list.yml +++ b/playbooks/all_host_vars_list.yml @@ -39,7 +39,7 @@ zowe_apiml_security_oidc_client_id: zowe_apiml_security_oidc_client_secret: zowe_apiml_security_oidc_registry: zowe_apiml_security_zosmf_applid: IZUDFLT -zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: AUTO +zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: JWT zowe_apiml_verify_certficates_of_services: true zowe_auto_create_user_group: false zowe_caching_service_persistent: infinispan diff --git a/playbooks/roles/configfmid/defaults/main.yml b/playbooks/roles/configfmid/defaults/main.yml index 34b56b1682..2547cf9097 100644 --- a/playbooks/roles/configfmid/defaults/main.yml +++ b/playbooks/roles/configfmid/defaults/main.yml @@ -61,7 +61,7 @@ zowe_apiml_gateway_timeout_millis: 600000 zowe_apiml_security_x509_enabled: false zowe_apiml_security_zosmf_applid: IZUDFLT zowe_apiml_security_auth_provider: zosmf -zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: AUTO +zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: JWT zowe_apiml_security_oidc_enabled: false zowe_apiml_security_oidc_client_id: zowe_apiml_security_oidc_client_secret: diff --git a/playbooks/roles/configure/defaults/main.yml b/playbooks/roles/configure/defaults/main.yml index b8f0373243..62356c113f 100644 --- a/playbooks/roles/configure/defaults/main.yml +++ b/playbooks/roles/configure/defaults/main.yml @@ -63,7 +63,7 @@ zowe_apiml_security_x509_enabled: false zowe_apiml_service_forwardClientCertEnabled: true zowe_apiml_security_zosmf_applid: IZUDFLT zowe_apiml_security_auth_provider: zosmf -zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: AUTO +zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: LTPA zowe_apiml_security_oidc_enabled: false zowe_apiml_security_oidc_client_id: zowe_apiml_security_oidc_client_secret: diff --git a/playbooks/roles/custom_for_test/defaults/main.yml b/playbooks/roles/custom_for_test/defaults/main.yml index ef620cbe0d..884cdbbf8f 100644 --- a/playbooks/roles/custom_for_test/defaults/main.yml +++ b/playbooks/roles/custom_for_test/defaults/main.yml @@ -67,7 +67,7 @@ zowe_apiml_security_oidc_registry: zowe_apiml_security_oidc_jwks_uri: zowe_apiml_security_zosmf_applid: IZUDFLT zowe_apiml_security_auth_provider: zosmf -zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: AUTO +zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: LTPA # explorer APIs/plugins ports zowe_jobs_explorer_port: 7560 zowe_mvs_explorer_port: 7561 From 043c9bfeea479a2ec53f530ed99441b6b7658814 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 5 Sep 2024 14:06:33 -0400 Subject: [PATCH 46/46] set all to jwt token playbooks to ltpa Signed-off-by: MarkAckert --- playbooks/all_host_vars_list.yml | 2 +- playbooks/roles/configfmid/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/all_host_vars_list.yml b/playbooks/all_host_vars_list.yml index e81a000a3e..ab362790d5 100644 --- a/playbooks/all_host_vars_list.yml +++ b/playbooks/all_host_vars_list.yml @@ -39,7 +39,7 @@ zowe_apiml_security_oidc_client_id: zowe_apiml_security_oidc_client_secret: zowe_apiml_security_oidc_registry: zowe_apiml_security_zosmf_applid: IZUDFLT -zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: JWT +zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: LTPA zowe_apiml_verify_certficates_of_services: true zowe_auto_create_user_group: false zowe_caching_service_persistent: infinispan diff --git a/playbooks/roles/configfmid/defaults/main.yml b/playbooks/roles/configfmid/defaults/main.yml index 2547cf9097..ba662c7ebe 100644 --- a/playbooks/roles/configfmid/defaults/main.yml +++ b/playbooks/roles/configfmid/defaults/main.yml @@ -61,7 +61,7 @@ zowe_apiml_gateway_timeout_millis: 600000 zowe_apiml_security_x509_enabled: false zowe_apiml_security_zosmf_applid: IZUDFLT zowe_apiml_security_auth_provider: zosmf -zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: JWT +zowe_apiml_security_zosmf_jwt_autoconfiguration_mode: LTPA zowe_apiml_security_oidc_enabled: false zowe_apiml_security_oidc_client_id: zowe_apiml_security_oidc_client_secret: