From 97126eab455163c4369e93a5e697cb66ee63f802 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 28 Mar 2024 09:50:27 -0400 Subject: [PATCH 01/31] WebUI v1.28.6 RC1 Signed-off-by: James Struga --- manifest.json.template | 82 +++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 2f007d1bca..20e5656513 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "1.28.5", + "version": "1.28.6", "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", @@ -12,59 +12,59 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "1.28.5-V1.X-RC", + "version": "1.28.6-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-1.28.5-20230927.185647.pax" + "artifact": "zlux-core-1.28.6-20240328.131846.pax" }, "org.zowe.zlux.zss-auth": { - "version": "1.28.5-V1.X-RC", + "version": "1.28.6-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "zss-auth-1.28.5-20230919.151333.pax" + "artifact": "zss-auth-1.28.6-20240328.133838.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "1.28.5-V1.X-RC", + "version": "1.28.6-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-1.28.5-20230919.151734.pax" + "artifact": "sample-angular-app-1.28.6-20240328.134126.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "1.28.5-V1.X-RC", + "version": "1.28.6-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-1.28.5-20230919.151625.pax" + "artifact": "sample-iframe-app-1.28.6-20240328.134039.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "1.28.5-V1.X-RC", + "version": "1.28.6-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-react-app-1.28.5-20230919.151750.pax" + "artifact": "sample-react-app-1.28.6-20240328.134318.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "1.28.5-V1.X-RC", + "version": "1.28.6-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-1.28.5-20230919.152143.pax" + "artifact": "tn3270-ng2-1.28.6-20240328.134419.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "1.28.5-V1.X-RC", + "version": "1.28.6-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "vt-ng2-1.28.5-20230919.152106.pax" + "artifact": "vt-ng2-1.28.6-20240328.134410.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "1.28.5-V1.X-RC", + "version": "1.28.6-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-editor-1.28.5-20230919.152422.pax" + "artifact": "zlux-editor-1.28.6-20240328.134630.pax" }, "org.zowe.zlux.zlux-workflow": { - "version": "1.28.5-V1.X-RC", + "version": "1.28.6-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-workflow-1.28.5-20230919.152300.pax" + "artifact": "zlux-workflow-1.28.6-20240328.134556.pax" }, "org.zowe.zlux.zosmf-auth": { - "version": "1.28.5-V1.X-RC", + "version": "1.28.6-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "zosmf-auth-1.28.5-20230919.152225.pax" + "artifact": "zosmf-auth-1.28.6-20240328.134447.pax" }, "org.zowe.zss": { - "version": "1.28.5-RC", + "version": "1.28.6-RC", "repository": "libs-snapshot-local", - "artifact": "zss-1.28.5-rc-988-20230920130435.pax" + "artifact": "zss-1.28.5-rc-1118-20240328134709.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "1.0.22", @@ -166,12 +166,12 @@ "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }, { @@ -186,17 +186,17 @@ }, { "repository": "zlux-platform", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }, { @@ -206,17 +206,17 @@ }, { "repository": "zlux-build", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v1.28.5-RC1", + "tag": "zss-v1.28.6-RC1", "destinations": ["Zowe PAX"] } ] @@ -336,11 +336,11 @@ "componentGroup": "Zowe Application Framework Authentication Handlers", "entries": [{ "repository": "zss-auth", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zosmf-auth", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }] }, @@ -348,14 +348,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }] }, @@ -363,7 +363,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }] }, @@ -371,7 +371,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }] }, @@ -379,7 +379,7 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }] }, @@ -387,7 +387,7 @@ "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }] }, @@ -395,7 +395,7 @@ "componentGroup": "Zowe Desktop Workflows Plugin-in", "entries": [{ "repository": "zlux-workflow", - "tag": "v1.28.5-RC1", + "tag": "v1.28.6-RC1", "destinations": ["Zowe PAX"] }] }, @@ -462,7 +462,7 @@ "app-server": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "1.28.5-ubuntu" + "tag" : "1.28.6-ubuntu" }, "explorer-ip": { "kind": "job", From 443d94fe4b44e9236f937f28579b8db63ae07bff Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 28 Mar 2024 12:16:37 -0400 Subject: [PATCH 02/31] Update zss 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 20e5656513..263948d9d6 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -64,7 +64,7 @@ "org.zowe.zss": { "version": "1.28.6-RC", "repository": "libs-snapshot-local", - "artifact": "zss-1.28.5-rc-1118-20240328134709.pax" + "artifact": "zss-1.28.6-rc-1121-20240328161402.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "1.0.22", From ea14795925759d0d486423de480c6fcd77ae4e34 Mon Sep 17 00:00:00 2001 From: achmelo Date: Thu, 28 Mar 2024 17:30:04 +0100 Subject: [PATCH 03/31] apiml 1.28.6 rc1 Signed-off-by: achmelo --- manifest.json.template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 2f007d1bca..be6b13d39a 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -91,27 +91,27 @@ "artifact": "explorer-ip*.pax" }, "org.zowe.apiml.sdk.api-catalog-package": { - "version": "1.28.24", + "version": "1.28.25", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.sdk.discovery-package": { - "version": "1.28.24", + "version": "1.28.25", "artifact": "discovery*.zip" }, "org.zowe.apiml.sdk.gateway-package": { - "version": "1.28.24", + "version": "1.28.25", "artifact": "gateway*.zip" }, "org.zowe.apiml.sdk.caching-service-package": { - "version": "1.28.24", + "version": "1.28.25", "artifact": "caching-service*.zip" }, "org.zowe.apiml.sdk.metrics-service-package": { - "version": "1.28.24", + "version": "1.28.25", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.sdk.apiml-common-lib-package": { - "version": "1.28.24", + "version": "1.28.25", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -119,7 +119,7 @@ "artifact": "common-java-lib-*.zip" }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "1.28.24", + "version": "1.28.25", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.launcher": { @@ -441,23 +441,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "1.28.24-ubuntu" + "tag" : "1.28.25-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "1.28.24-ubuntu" + "tag" : "1.28.25-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "1.28.24-ubuntu" + "tag" : "1.28.25-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "1.28.24-ubuntu" + "tag" : "1.28.25-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From c2d61b3dc0c973f3ed03e82665bd70536e8f4342 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Thu, 28 Mar 2024 19:21:50 +0000 Subject: [PATCH 04/31] Update component versions Signed-off-by: zowe-robot --- manifest.json.template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c950b7c633..044f564707 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -228,21 +228,21 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "zowe-v1-lts", + "tag": "v6.40.27", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® CICS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-cics-plugin", - "tag": "zowe-v1-lts", + "tag": "v4.0.11", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® Db2® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-db2-plugin", - "tag": "zowe-v1-lts", + "tag": "v4.1.13", "destinations": ["Zowe CLI Package"] }] }, { @@ -256,28 +256,28 @@ "componentGroup": "IBM® MQ Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-mq-plugin", - "tag": "zowe-v1-lts", + "tag": "v2.0.4", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Secure Credential Store Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-scs-plugin", - "tag": "master", + "tag": "v4.1.12", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "z/OS® FTP Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ftp-plugin", - "tag": "zowe-v1-lts", + "tag": "v1.8.8", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® IMS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ims-plugin", - "tag": "zowe-v1-lts", + "tag": "v2.0.5", "destinations": ["Zowe CLI Package"] }] }, { From bb10934140eb57bfbe8629ebb32f8f42ae51467c Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 3 Apr 2024 11:11:15 -0400 Subject: [PATCH 05/31] lock in files, jobs, datasets explorer artifacts Signed-off-by: MarkAckert --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 044f564707..776b2ab656 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -67,12 +67,12 @@ "artifact": "zss-1.28.6-rc-1121-20240328161402.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "^1.0.0-SNAPSHOT", + "version": "1.0.23", "artifact": "jobs-api-package-*.zip", "exclusions": ["*PR*.zip","*BRANCH*"] }, "org.zowe.explorer.files.files-api-package": { - "version": "^1.0.0-SNAPSHOT", + "version": "1.0.25", "artifact": "files-api-package-*.zip", "exclusions": ["*PR*.zip","*BRANCH*"] }, From cb87f835a57dff30450e8cbe0aaf3481f47ca3dc Mon Sep 17 00:00:00 2001 From: ManjuVNair133 Date: Mon, 8 Apr 2024 20:09:44 +0530 Subject: [PATCH 06/31] update manifest.json.template file for v1.28.6 Signed-off-by: ManjuVNair133 --- manifest.json.template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 776b2ab656..f9b2b1db24 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -440,7 +440,7 @@ "zowe-launch-scripts": { "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/zowe-launch-scripts", - "tag" : "1.25.0-ubuntu.staging" + "tag" : "1.28.6-ubuntu" }, "api-catalog": { "registry": "zowe-docker-release.jfrog.io", @@ -472,32 +472,32 @@ "kind": "job", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-ip", - "tag" : "1-ubuntu" + "tag" : "1.0.1-ubuntu" }, "explorer-jes": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-jes", - "tag" : "1-ubuntu" + "tag" : "1.0.23-ubuntu" }, "explorer-mvs": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-mvs", - "tag" : "1-ubuntu" + "tag" : "1.0.21-ubuntu" }, "explorer-uss": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-uss", - "tag" : "1-ubuntu" + "tag" : "1.0.23-ubuntu" }, "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "1-ubuntu" + "tag" : "1.0.24-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "1-ubuntu" + "tag" : "1.0.22-ubuntu" } }, "dependencyDecisions": { From 6adac382847f3aa6d16fd6c7299ac5021fe32157 Mon Sep 17 00:00:00 2001 From: ojcelis Date: Tue, 9 Apr 2024 12:36:47 -0400 Subject: [PATCH 07/31] update imageDependencies zowe-launch-scripts Signed-off-by: ojcelis --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index f9b2b1db24..c3e31754a8 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -438,7 +438,7 @@ ], "imageDependencies": { "zowe-launch-scripts": { - "registry": "zowe-docker-snapshot.jfrog.io", + "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/zowe-launch-scripts", "tag" : "1.28.6-ubuntu" }, From 3fa6a305155cb792073014b59857367d3abec3de Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 11 Apr 2024 11:26:17 -0400 Subject: [PATCH 08/31] update licenses package 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 c3e31754a8..1c77cb88b1 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -140,7 +140,7 @@ "version": "~0.0.8-SNAPSHOT" }, "org.zowe.licenses": { - "version": "1.28.1", + "version": "1.28.6", "artifact": "zowe_licenses_full.zip" } }, From ed578325073d0b315bfe9f61f11e674fb173d862 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 11 Apr 2024 15:44:11 -0400 Subject: [PATCH 09/31] remove imperative (now in zowe-cli) Signed-off-by: MarkAckert --- manifest.json.template | 7 ------- 1 file changed, 7 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 1c77cb88b1..131a0df255 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -146,13 +146,6 @@ }, "sourceDependencies": [ { - "componentGroup": "Imperative CLI Framework for Zowe", - "entries": [{ - "repository": "imperative", - "tag": "zowe-v1-lts", - "destinations": ["Zowe CLI Package"] - }] - }, { "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", From 6e2aa28061623bb5c82bdbf8be2a1f9e239d0ddb Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 11 Apr 2024 17:25:12 -0400 Subject: [PATCH 10/31] update cics cli repo Signed-off-by: MarkAckert --- manifest.json.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 131a0df255..388f04a8eb 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -149,14 +149,14 @@ "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v1.x.x", + "tag": "v1.28.25", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe common java libraries", "entries": [{ "repository": "common-java", - "tag": "v1", + "tag": "v1.21.3", "destinations": ["Zowe PAX"] }] }, { @@ -227,7 +227,7 @@ }, { "componentGroup": "IBM® CICS® Plug-in for Zowe CLI", "entries": [{ - "repository": "zowe-cli-cics-plugin", + "repository": "cics-for-zowe-client", "tag": "v4.0.11", "destinations": ["Zowe CLI Package"] }] From c9e85d956161c3fd5c89282211332fdc49de699d Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 11 Apr 2024 17:35:39 -0400 Subject: [PATCH 11/31] fix remaining versions Signed-off-by: MarkAckert --- manifest.json.template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 388f04a8eb..c1754309ca 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -284,49 +284,49 @@ "componentGroup": "Zowe Desktop Eclipse Orion-based React Editor", "entries": [{ "repository": "orion-editor-component", - "tag": "master", + "tag": "v0.0.16", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop JES UI Plugin", "entries": [{ "repository": "explorer-jes", - "tag": "v1.x/master", + "tag": "v1.0.23", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Web Plug-in Server", "entries": [{ "repository": "explorer-ui-server", - "tag": "staging", + "tag": "v0.2.19", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v1.x/master", + "tag": "v1.0.23", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "v1.x/master", + "tag": "1.1.20", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "v1.x/master", + "tag": "1.0.24", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "v1.x/master", + "tag": "1.0.22", "destinations": ["Zowe PAX"] }] }, { @@ -400,15 +400,15 @@ "componentGroup": "Utilities", "entries": [{ "repository": "keyring-utilities", - "tag": "master", + "tag": "v1.0.4", "destinations": ["Zowe PAX"] }, { "repository": "zowe-install-packaging-tools", - "tag": "v1.x/master", + "tag": "v0.0.13", "destinations": ["Zowe PAX"] }, { "repository": "launcher", - "tag": "v1.x/master", + "tag": "v0.0.10", "destinations": ["Zowe PAX"] }] }, @@ -416,7 +416,7 @@ "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ "repository": "vscode-extension-for-zowe", - "tag": "v1-lts", + "tag": "v1.22.6", "destinations": ["Visual Studio Code Marketplace"] }] }, @@ -424,7 +424,7 @@ "componentGroup": "Zowe Desktop IP Explorer Plug-in", "entries": [{ "repository": "explorer-ip", - "tag": "v1.x/master", + "tag": "v1.0.0", "destinations": ["Zowe PAX"] }] } From d8da66cdfae51a74bf5e03ce3edbede504b7a35a Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 11 Apr 2024 17:43:10 -0400 Subject: [PATCH 12/31] fix zowe vscode repo name 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 c1754309ca..16a9438a0e 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -415,7 +415,7 @@ { "componentGroup": "Zowe Visual Studio Code Extension", "entries": [{ - "repository": "vscode-extension-for-zowe", + "repository": "zowe-explorer-vscode", "tag": "v1.22.6", "destinations": ["Visual Studio Code Marketplace"] }] From c182af889b4f62e06e3a7eb473722e59a7e9f728 Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Fri, 24 May 2024 14:17:26 +0000 Subject: [PATCH 13/31] Update component versions Signed-off-by: zowe-robot --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index c3e31754a8..ab4adce591 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -228,7 +228,7 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v6.40.27", + "tag": "v6.40.28", "destinations": ["Zowe CLI Package"] }] }, { From 311b52519797ce97d205654fd52003bd5716361a Mon Sep 17 00:00:00 2001 From: achmelo Date: Wed, 29 May 2024 16:21:50 +0200 Subject: [PATCH 14/31] API ML 1.28.7 rc1 Signed-off-by: achmelo --- manifest.json.template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c3e31754a8..e287d59037 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -93,27 +93,27 @@ "artifact": "*.pax" }, "org.zowe.apiml.sdk.api-catalog-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.sdk.discovery-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "discovery*.zip" }, "org.zowe.apiml.sdk.gateway-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "gateway*.zip" }, "org.zowe.apiml.sdk.caching-service-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "caching-service*.zip" }, "org.zowe.apiml.sdk.metrics-service-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.sdk.apiml-common-lib-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -122,7 +122,7 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.launcher": { @@ -445,23 +445,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From 521c3763dcada6c55e7f0be3b77dd80baf9e17d5 Mon Sep 17 00:00:00 2001 From: achmelo Date: Wed, 29 May 2024 16:21:50 +0200 Subject: [PATCH 15/31] API ML 1.28.7 rc1 Signed-off-by: achmelo --- manifest.json.template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c3e31754a8..e287d59037 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -93,27 +93,27 @@ "artifact": "*.pax" }, "org.zowe.apiml.sdk.api-catalog-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.sdk.discovery-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "discovery*.zip" }, "org.zowe.apiml.sdk.gateway-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "gateway*.zip" }, "org.zowe.apiml.sdk.caching-service-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "caching-service*.zip" }, "org.zowe.apiml.sdk.metrics-service-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.sdk.apiml-common-lib-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -122,7 +122,7 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "1.28.25", + "version": "1.28.26", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.launcher": { @@ -445,23 +445,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "1.28.25-ubuntu" + "tag" : "1.28.26-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From 09fd4887e38a7579cd38dd9a3af3fa6363be83f6 Mon Sep 17 00:00:00 2001 From: achmelo Date: Thu, 30 May 2024 09:40:54 +0200 Subject: [PATCH 16/31] datasets and jobs 1.28.7 rc1 Signed-off-by: achmelo --- manifest.json.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index e287d59037..530c8bbd52 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -67,12 +67,12 @@ "artifact": "zss-1.28.6-rc-1121-20240328161402.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "1.0.23", + "version": "1.0.24", "artifact": "jobs-api-package-*.zip", "exclusions": ["*PR*.zip","*BRANCH*"] }, "org.zowe.explorer.files.files-api-package": { - "version": "1.0.25", + "version": "1.0.26", "artifact": "files-api-package-*.zip", "exclusions": ["*PR*.zip","*BRANCH*"] }, @@ -492,12 +492,12 @@ "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "1.0.24-ubuntu" + "tag" : "1.0.25-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "1.0.22-ubuntu" + "tag" : "1.0.23-ubuntu" } }, "dependencyDecisions": { From 5d617a52adb9fd48cc8f9b09e0d0202fe5598fc3 Mon Sep 17 00:00:00 2001 From: achmelo Date: Thu, 30 May 2024 09:43:36 +0200 Subject: [PATCH 17/31] Revert "API ML 1.28.7 rc1" This reverts commit 311b52519797ce97d205654fd52003bd5716361a. Signed-off-by: achmelo --- manifest.json.template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 530c8bbd52..422cc639fd 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -93,27 +93,27 @@ "artifact": "*.pax" }, "org.zowe.apiml.sdk.api-catalog-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "api-catalog*.zip" }, "org.zowe.apiml.sdk.discovery-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "discovery*.zip" }, "org.zowe.apiml.sdk.gateway-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "gateway*.zip" }, "org.zowe.apiml.sdk.caching-service-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "caching-service*.zip" }, "org.zowe.apiml.sdk.metrics-service-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "metrics-service*.zip" }, "org.zowe.apiml.sdk.apiml-common-lib-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "apiml-common-lib-*.zip" }, "org.zowe.apiml.sdk.common-java-lib-package": { @@ -122,7 +122,7 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "1.28.26", + "version": "1.28.25", "artifact": "apiml-sample-extension-*.zip" }, "org.zowe.launcher": { @@ -445,23 +445,23 @@ "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "1.28.26-ubuntu" + "tag" : "1.28.25-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "1.28.26-ubuntu" + "tag" : "1.28.25-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "1.28.26-ubuntu" + "tag" : "1.28.25-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "1.28.26-ubuntu" + "tag" : "1.28.25-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", From 059dc02b6091409cbd275fa4dc3ef94bde621af0 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 30 May 2024 11:53:08 -0400 Subject: [PATCH 18/31] add manifest Signed-off-by: James Struga --- manifest.json.template | 82 +++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index c3e31754a8..2e63ec721c 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "1.28.6", + "version": "1.28.7", "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", @@ -12,59 +12,59 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "1.28.6-V1.X-RC", + "version": "1.28.7-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-core-1.28.6-20240328.131846.pax" + "artifact": "zlux-core-1.28.7-20240530.151858.pax" }, "org.zowe.zlux.zss-auth": { - "version": "1.28.6-V1.X-RC", + "version": "1.28.7-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "zss-auth-1.28.6-20240328.133838.pax" + "artifact": "zss-auth-1.28.7-20240530.151032.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "1.28.6-V1.X-RC", + "version": "1.28.7-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-1.28.6-20240328.134126.pax" + "artifact": "sample-angular-app-1.28.7-20240530.151138.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "1.28.6-V1.X-RC", + "version": "1.28.7-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-1.28.6-20240328.134039.pax" + "artifact": "sample-iframe-app-1.28.7-20240530.151016.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "1.28.6-V1.X-RC", + "version": "1.28.7-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "sample-react-app-1.28.6-20240328.134318.pax" + "artifact": "sample-react-app-1.28.7-20240530.151124.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "1.28.6-V1.X-RC", + "version": "1.28.7-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-1.28.6-20240328.134419.pax" + "artifact": "tn3270-ng2-1.28.7-20240530.014242.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "1.28.6-V1.X-RC", + "version": "1.28.7-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "vt-ng2-1.28.6-20240328.134410.pax" + "artifact": "vt-ng2-1.28.7-20240530.151040.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "1.28.6-V1.X-RC", + "version": "1.28.7-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-editor-1.28.6-20240328.134630.pax" + "artifact": "zlux-editor-1.28.7-20240530.151320.pax" }, "org.zowe.zlux.zlux-workflow": { - "version": "1.28.6-V1.X-RC", + "version": "1.28.7-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "zlux-workflow-1.28.6-20240328.134556.pax" + "artifact": "zlux-workflow-1.28.7-20240530.151205.pax" }, "org.zowe.zlux.zosmf-auth": { - "version": "1.28.6-V1.X-RC", + "version": "1.28.7-V1.X-RC", "repository": "libs-snapshot-local", - "artifact": "zosmf-auth-1.28.6-20240328.134447.pax" + "artifact": "zosmf-auth-1.28.7-20240530.154904.pax" }, "org.zowe.zss": { - "version": "1.28.6-RC", + "version": "1.28.7-RC", "repository": "libs-snapshot-local", - "artifact": "zss-1.28.6-rc-1121-20240328161402.pax" + "artifact": "zss-1.28.7-rc-1142-20240529170519.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { "version": "1.0.23", @@ -170,12 +170,12 @@ "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }, { @@ -190,17 +190,17 @@ }, { "repository": "zlux-platform", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }, { @@ -210,17 +210,17 @@ }, { "repository": "zlux-build", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v1.28.6-RC1", + "tag": "zss-v1.28.7-RC1", "destinations": ["Zowe PAX"] } ] @@ -340,11 +340,11 @@ "componentGroup": "Zowe Application Framework Authentication Handlers", "entries": [{ "repository": "zss-auth", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }, { "repository": "zosmf-auth", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }] }, @@ -352,14 +352,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }] }, @@ -367,7 +367,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }] }, @@ -375,7 +375,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }] }, @@ -383,7 +383,7 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }] }, @@ -391,7 +391,7 @@ "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }] }, @@ -399,7 +399,7 @@ "componentGroup": "Zowe Desktop Workflows Plugin-in", "entries": [{ "repository": "zlux-workflow", - "tag": "v1.28.6-RC1", + "tag": "v1.28.7-RC1", "destinations": ["Zowe PAX"] }] }, @@ -466,7 +466,7 @@ "app-server": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "1.28.6-ubuntu" + "tag" : "1.28.7-ubuntu" }, "explorer-ip": { "kind": "job", From a126ef42470e517575d4f05fc36d3e1070411f5c Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 30 May 2024 15:50:47 -0400 Subject: [PATCH 19/31] update licenses 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 c4f87611c0..2d251e975e 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -140,7 +140,7 @@ "version": "~0.0.8-SNAPSHOT" }, "org.zowe.licenses": { - "version": "1.28.1", + "version": "1.28.7", "artifact": "zowe_licenses_full.zip" } }, From 170a457fc689a709b2c85afbb97165a683accdfe Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 30 May 2024 15:55:38 -0400 Subject: [PATCH 20/31] update sourceDeps Signed-off-by: MarkAckert --- manifest.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 91e198833c..0be54cca82 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -326,14 +326,14 @@ "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "v1.x/master", + "tag": "1.0.26", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "v1.x/master", + "tag": "1.0.24", "destinations": ["Zowe PAX"] }] }, { From 6a5ba959dabcd1c1a657d9156c094e62f4d58ea8 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Mon, 3 Jun 2024 15:00:13 -0400 Subject: [PATCH 21/31] skip fmid config step for ptf tests Signed-off-by: MarkAckert --- playbooks/README.md | 1 + playbooks/install-fmid.yml | 1 + tests/installation/src/utils.ts | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/playbooks/README.md b/playbooks/README.md index 734ae85e1e..82375e26aa 100644 --- a/playbooks/README.md +++ b/playbooks/README.md @@ -261,6 +261,7 @@ $ ansible-playbook -l show-logs.yml -v - **zowe_auto_create_user_group**: A boolean value to enable or disable creating Zowe user and group. Default value is `false`. - **zowe_configure_skip_zwesecur**: A boolean value to skip running `ZWESECUR` job when configure Zowe instance. - **zos_keystore_mode**: An optional string to configure Zowe instance to store certificates into Keyring instead of keystore. Valid values are `` (default value) or `KEYSTORE_MODE_KEYRING`. +- **skip_configfmid**: A boolean value to skip automatically configuring Zowe after FMID installation. Default value is `false`. - **skip_start**: A boolean value to skip automatically starting Zowe after installation. Default value is `false`. - **zowe_uninstall_before_install**: If you want to uninstall Zowe before installing a new version. Default value is `true`. - **ZOWE_COMPONENTS_UPGRADE**: An optional boolean value to enable upgrading Zowe components to the latest version. If set to `true`, diff --git a/playbooks/install-fmid.yml b/playbooks/install-fmid.yml index c095977c31..f363d4ba64 100644 --- a/playbooks/install-fmid.yml +++ b/playbooks/install-fmid.yml @@ -83,6 +83,7 @@ # Configure Zowe - import_role: name: configfmid + when: not skip_configfmid|default(False) # ============================================================================ # Start Zowe diff --git a/tests/installation/src/utils.ts b/tests/installation/src/utils.ts index 9de5efe94c..d72d93ba9b 100644 --- a/tests/installation/src/utils.ts +++ b/tests/installation/src/utils.ts @@ -381,7 +381,9 @@ export async function installAndVerifySmpePtf(testcase: string, serverId: string 'install-fmid.yml', serverId, { - 'zowe_build_remote': ZOWE_FMID + 'zowe_build_remote': ZOWE_FMID, + 'skip_configfmid': 'true', + 'skip_start': 'true' } ); From 0184e37a9668b88fbeee20f3f6aa38f0b22aaa51 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Tue, 4 Jun 2024 08:46:03 -0400 Subject: [PATCH 22/31] address build failure Signed-off-by: MarkAckert --- playbooks/install-fmid.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/playbooks/install-fmid.yml b/playbooks/install-fmid.yml index f363d4ba64..e9cdb61ef4 100644 --- a/playbooks/install-fmid.yml +++ b/playbooks/install-fmid.yml @@ -81,6 +81,16 @@ # ============================================================================ # Configure Zowe + + ## This runs only when skip_configfmid=true. Checks that instance.env is preserved + ## during a PTF upgrade. (See install-ptf.yml for instance verification) + - import_role: + name: configfmid + tasks_from: configure_instance + when: skip_configfmid|default(False) + + ## This runs by default, or when skip_configfmid=false. Full configuration and + ## installation of Zowe from the FMID base PAX. No longer compatible on z/OS 2.5+ - import_role: name: configfmid when: not skip_configfmid|default(False) From 2c324e06e1c73c891b42255ea475a3fa3063f8c9 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Tue, 4 Jun 2024 09:20:50 -0400 Subject: [PATCH 23/31] debug content Signed-off-by: MarkAckert --- playbooks/roles/configfmid/tasks/configure_instance.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/playbooks/roles/configfmid/tasks/configure_instance.yml b/playbooks/roles/configfmid/tasks/configure_instance.yml index 209bddd7d1..fc5f3fb5d5 100644 --- a/playbooks/roles/configfmid/tasks/configure_instance.yml +++ b/playbooks/roles/configfmid/tasks/configure_instance.yml @@ -1,5 +1,9 @@ --- # this playbook call bin/zowe-configure-instance.sh to create instance + +- name: Dump env (debug) + raw: env + - name: Create Zowe instance import_role: name: zos From cb4bf43236773a2b6e124b2a4f82dcf2c821c565 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 5 Jun 2024 09:56:53 -0400 Subject: [PATCH 24/31] move certificate setup post-ptf Signed-off-by: MarkAckert --- playbooks/README.md | 1 + playbooks/install-fmid.yml | 11 ----------- playbooks/roles/configfmid/tasks/main.yml | 6 ------ playbooks/roles/ptf/tasks/main.yml | 6 ++++++ .../{configfmid => ptf}/tasks/setup_certificates.yml | 0 playbooks/roles/zos/tasks/upload_and_run_script.yml | 5 +++++ 6 files changed, 12 insertions(+), 17 deletions(-) rename playbooks/roles/{configfmid => ptf}/tasks/setup_certificates.yml (100%) diff --git a/playbooks/README.md b/playbooks/README.md index 82375e26aa..7d987a0b83 100644 --- a/playbooks/README.md +++ b/playbooks/README.md @@ -261,6 +261,7 @@ $ ansible-playbook -l show-logs.yml -v - **zowe_auto_create_user_group**: A boolean value to enable or disable creating Zowe user and group. Default value is `false`. - **zowe_configure_skip_zwesecur**: A boolean value to skip running `ZWESECUR` job when configure Zowe instance. - **zos_keystore_mode**: An optional string to configure Zowe instance to store certificates into Keyring instead of keystore. Valid values are `` (default value) or `KEYSTORE_MODE_KEYRING`. +- **convert_upload**: A boolean value to convert uploaded scripts from ASCII to EBCDIC post-transfer. Required for some distros, such as MacOSX. Default value is `false`. - **skip_configfmid**: A boolean value to skip automatically configuring Zowe after FMID installation. Default value is `false`. - **skip_start**: A boolean value to skip automatically starting Zowe after installation. Default value is `false`. - **zowe_uninstall_before_install**: If you want to uninstall Zowe before installing a new version. Default value is `true`. diff --git a/playbooks/install-fmid.yml b/playbooks/install-fmid.yml index e9cdb61ef4..c095977c31 100644 --- a/playbooks/install-fmid.yml +++ b/playbooks/install-fmid.yml @@ -81,19 +81,8 @@ # ============================================================================ # Configure Zowe - - ## This runs only when skip_configfmid=true. Checks that instance.env is preserved - ## during a PTF upgrade. (See install-ptf.yml for instance verification) - - import_role: - name: configfmid - tasks_from: configure_instance - when: skip_configfmid|default(False) - - ## This runs by default, or when skip_configfmid=false. Full configuration and - ## installation of Zowe from the FMID base PAX. No longer compatible on z/OS 2.5+ - import_role: name: configfmid - when: not skip_configfmid|default(False) # ============================================================================ # Start Zowe diff --git a/playbooks/roles/configfmid/tasks/main.yml b/playbooks/roles/configfmid/tasks/main.yml index ab8823eb68..9fef6abac0 100644 --- a/playbooks/roles/configfmid/tasks/main.yml +++ b/playbooks/roles/configfmid/tasks/main.yml @@ -63,12 +63,6 @@ tasks_from: create_security_defn when: not zowe_configure_skip_zwesecur -# ============================================================================ -# Setup certificates -- import_role: - name: configfmid - tasks_from: setup_certificates - # ============================================================================ # Configure Zowe Instance - import_role: diff --git a/playbooks/roles/ptf/tasks/main.yml b/playbooks/roles/ptf/tasks/main.yml index f57e01ebc3..754104b8c8 100644 --- a/playbooks/roles/ptf/tasks/main.yml +++ b/playbooks/roles/ptf/tasks/main.yml @@ -174,3 +174,9 @@ when: not ptfs_existence[item] loop: - "{{ zowe_smpe_ptf_2 }}" + +# ============================================================================ +# Setup certificates +- import_role: + name: ptf + tasks_from: setup_certificates diff --git a/playbooks/roles/configfmid/tasks/setup_certificates.yml b/playbooks/roles/ptf/tasks/setup_certificates.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/setup_certificates.yml rename to playbooks/roles/ptf/tasks/setup_certificates.yml diff --git a/playbooks/roles/zos/tasks/upload_and_run_script.yml b/playbooks/roles/zos/tasks/upload_and_run_script.yml index 08140ae5e9..bf12b76b97 100644 --- a/playbooks/roles/zos/tasks/upload_and_run_script.yml +++ b/playbooks/roles/zos/tasks/upload_and_run_script.yml @@ -13,6 +13,11 @@ file_upload_method: scp file_upload_hashcheck: false +# Necessary for some scp distros, as on MacOS +- name: Convert ascii to ebcdic + when: convert_upload|default(False) + raw: iconv -f ISO8859-1 -t IBM-1047 "{{ work_dir_remote }}/{{ upload_and_run_script_filename }}" > "{{ work_dir_remote }}/{{ upload_and_run_script_filename }}.ebcdic" && mv "{{ work_dir_remote }}/{{ upload_and_run_script_filename }}.ebcdic" "{{ work_dir_remote }}/{{ upload_and_run_script_filename }}" + - name: Add executive permission to {{ upload_and_run_script_filename }} raw: chmod a+x "{{ work_dir_remote }}/{{ upload_and_run_script_filename }}" From 5dfa9179354e9cf10ce37b00b75d1481c9fe11d8 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 5 Jun 2024 12:58:26 -0400 Subject: [PATCH 25/31] move to configptf Signed-off-by: MarkAckert --- playbooks/install-fmid.yml | 13 +------------ playbooks/install-ptf.yml | 5 +++++ playbooks/roles/{configfmid => configptf}/README.md | 0 .../{configfmid => configptf}/defaults/main.yml | 0 .../roles/{configfmid => configptf}/meta/main.yml | 0 .../tasks/configure_instance.yml | 0 .../tasks/create_security_defn.yml | 0 .../tasks/install_proc.yml | 0 .../tasks/install_xmem_server.yml | 0 .../roles/{configfmid => configptf}/tasks/main.yml | 0 .../{ptf => configptf}/tasks/setup_certificates.yml | 0 .../tasks/validate_configuration.yml | 0 12 files changed, 6 insertions(+), 12 deletions(-) rename playbooks/roles/{configfmid => configptf}/README.md (100%) rename playbooks/roles/{configfmid => configptf}/defaults/main.yml (100%) rename playbooks/roles/{configfmid => configptf}/meta/main.yml (100%) rename playbooks/roles/{configfmid => configptf}/tasks/configure_instance.yml (100%) rename playbooks/roles/{configfmid => configptf}/tasks/create_security_defn.yml (100%) rename playbooks/roles/{configfmid => configptf}/tasks/install_proc.yml (100%) rename playbooks/roles/{configfmid => configptf}/tasks/install_xmem_server.yml (100%) rename playbooks/roles/{configfmid => configptf}/tasks/main.yml (100%) rename playbooks/roles/{ptf => configptf}/tasks/setup_certificates.yml (100%) rename playbooks/roles/{configfmid => configptf}/tasks/validate_configuration.yml (100%) diff --git a/playbooks/install-fmid.yml b/playbooks/install-fmid.yml index c095977c31..8ed10dfad7 100644 --- a/playbooks/install-fmid.yml +++ b/playbooks/install-fmid.yml @@ -1,5 +1,5 @@ --- -- name: Install Zowe SMPE FMID +- name: Install Zowe SMPE FMID. hosts: all gather_facts: false become: false @@ -78,14 +78,3 @@ - import_role: name: fmid tasks_from: overwrite_vars - - # ============================================================================ - # Configure Zowe - - import_role: - name: configfmid - - # ============================================================================ - # Start Zowe - - import_role: - name: start - when: not skip_start|default(False) diff --git a/playbooks/install-ptf.yml b/playbooks/install-ptf.yml index 8a969d9575..56054530b0 100644 --- a/playbooks/install-ptf.yml +++ b/playbooks/install-ptf.yml @@ -61,6 +61,11 @@ name: fmid tasks_from: overwrite_vars + # ============================================================================ + # Configure Zowe + - import_role: + name: configptf + # ============================================================================ # FIXME - name: Check if zowe_keystore_dir has a value diff --git a/playbooks/roles/configfmid/README.md b/playbooks/roles/configptf/README.md similarity index 100% rename from playbooks/roles/configfmid/README.md rename to playbooks/roles/configptf/README.md diff --git a/playbooks/roles/configfmid/defaults/main.yml b/playbooks/roles/configptf/defaults/main.yml similarity index 100% rename from playbooks/roles/configfmid/defaults/main.yml rename to playbooks/roles/configptf/defaults/main.yml diff --git a/playbooks/roles/configfmid/meta/main.yml b/playbooks/roles/configptf/meta/main.yml similarity index 100% rename from playbooks/roles/configfmid/meta/main.yml rename to playbooks/roles/configptf/meta/main.yml diff --git a/playbooks/roles/configfmid/tasks/configure_instance.yml b/playbooks/roles/configptf/tasks/configure_instance.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/configure_instance.yml rename to playbooks/roles/configptf/tasks/configure_instance.yml diff --git a/playbooks/roles/configfmid/tasks/create_security_defn.yml b/playbooks/roles/configptf/tasks/create_security_defn.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/create_security_defn.yml rename to playbooks/roles/configptf/tasks/create_security_defn.yml diff --git a/playbooks/roles/configfmid/tasks/install_proc.yml b/playbooks/roles/configptf/tasks/install_proc.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/install_proc.yml rename to playbooks/roles/configptf/tasks/install_proc.yml diff --git a/playbooks/roles/configfmid/tasks/install_xmem_server.yml b/playbooks/roles/configptf/tasks/install_xmem_server.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/install_xmem_server.yml rename to playbooks/roles/configptf/tasks/install_xmem_server.yml diff --git a/playbooks/roles/configfmid/tasks/main.yml b/playbooks/roles/configptf/tasks/main.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/main.yml rename to playbooks/roles/configptf/tasks/main.yml diff --git a/playbooks/roles/ptf/tasks/setup_certificates.yml b/playbooks/roles/configptf/tasks/setup_certificates.yml similarity index 100% rename from playbooks/roles/ptf/tasks/setup_certificates.yml rename to playbooks/roles/configptf/tasks/setup_certificates.yml diff --git a/playbooks/roles/configfmid/tasks/validate_configuration.yml b/playbooks/roles/configptf/tasks/validate_configuration.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/validate_configuration.yml rename to playbooks/roles/configptf/tasks/validate_configuration.yml From 0709296fcb05ac5ced8161082c48e78f36473d84 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 5 Jun 2024 13:46:06 -0400 Subject: [PATCH 26/31] small fixes Signed-off-by: MarkAckert --- playbooks/install-ptf.yml | 2 +- playbooks/roles/configptf/tasks/main.yml | 8 ++++---- playbooks/roles/configure/README.md | 4 +++- playbooks/roles/ptf/tasks/main.yml | 6 ------ 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/playbooks/install-ptf.yml b/playbooks/install-ptf.yml index 56054530b0..895c5509da 100644 --- a/playbooks/install-ptf.yml +++ b/playbooks/install-ptf.yml @@ -83,7 +83,7 @@ # ============================================================================ - name: Test upgraded configuration import_role: - name: configfmid + name: configptf tasks_from: validate_configuration # ============================================================================ diff --git a/playbooks/roles/configptf/tasks/main.yml b/playbooks/roles/configptf/tasks/main.yml index 9fef6abac0..536f9059de 100644 --- a/playbooks/roles/configptf/tasks/main.yml +++ b/playbooks/roles/configptf/tasks/main.yml @@ -45,13 +45,13 @@ # ============================================================================ # Install Zowe proc - import_role: - name: configfmid + name: configptf tasks_from: install_proc # ============================================================================ # Install Cross Memory Server - import_role: - name: configfmid + name: configptf tasks_from: install_xmem_server vars: zowe_xmem_install_from_path: "{{ zowe_root_dir }}/scripts/utils" @@ -59,12 +59,12 @@ # ============================================================================ # Run ZWESECUR - import_role: - name: configfmid + name: configptf tasks_from: create_security_defn when: not zowe_configure_skip_zwesecur # ============================================================================ # Configure Zowe Instance - import_role: - name: configfmid + name: configptf tasks_from: configure_instance diff --git a/playbooks/roles/configure/README.md b/playbooks/roles/configure/README.md index a3a93cced6..e1a9f5b069 100644 --- a/playbooks/roles/configure/README.md +++ b/playbooks/roles/configure/README.md @@ -2,4 +2,6 @@ This role will configure Zowe after Zowe runtime has been laid down on the server. -Please note: if you want to configure FMID, should use `configfmid` role. +Please note: if you want to configure SMP/e install, should use `configptf` role. + +Please note: config no longers works for base FMID on z/OS 2.5+ diff --git a/playbooks/roles/ptf/tasks/main.yml b/playbooks/roles/ptf/tasks/main.yml index 754104b8c8..f57e01ebc3 100644 --- a/playbooks/roles/ptf/tasks/main.yml +++ b/playbooks/roles/ptf/tasks/main.yml @@ -174,9 +174,3 @@ when: not ptfs_existence[item] loop: - "{{ zowe_smpe_ptf_2 }}" - -# ============================================================================ -# Setup certificates -- import_role: - name: ptf - tasks_from: setup_certificates From 83a8ca88cc5c095a37528d05d3aab2fb1cb791f0 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 6 Jun 2024 15:23:37 -0400 Subject: [PATCH 27/31] try skipping old configfmid Signed-off-by: MarkAckert --- playbooks/install-ptf.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/playbooks/install-ptf.yml b/playbooks/install-ptf.yml index 895c5509da..6d914e9d56 100644 --- a/playbooks/install-ptf.yml +++ b/playbooks/install-ptf.yml @@ -61,10 +61,6 @@ name: fmid tasks_from: overwrite_vars - # ============================================================================ - # Configure Zowe - - import_role: - name: configptf # ============================================================================ # FIXME From 5cf632828afdb04d308e7307babd731196d2a399 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Thu, 6 Jun 2024 15:50:42 -0400 Subject: [PATCH 28/31] remove validate_configuration check Signed-off-by: MarkAckert --- playbooks/install-ptf.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/playbooks/install-ptf.yml b/playbooks/install-ptf.yml index 6d914e9d56..0b0e560239 100644 --- a/playbooks/install-ptf.yml +++ b/playbooks/install-ptf.yml @@ -76,12 +76,6 @@ - import_role: name: configure - # ============================================================================ - - name: Test upgraded configuration - import_role: - name: configptf - tasks_from: validate_configuration - # ============================================================================ # Start Zowe - import_role: From 52fe1f79ff3b6d591939c4c3212c78e58d6acafd Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 7 Jun 2024 09:58:39 -0400 Subject: [PATCH 29/31] remove debug, add more conversions Signed-off-by: MarkAckert --- .../configptf/tasks/configure_instance.yml | 4 ---- .../roles/configptf/tasks/install_proc.yml | 2 +- .../configptf/tasks/install_xmem_server.yml | 2 +- .../roles/ptf/tasks/is_ptf_installed.yml | 4 ++++ playbooks/roles/ptf/tasks/main.yml | 23 ++++++++++++++----- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/playbooks/roles/configptf/tasks/configure_instance.yml b/playbooks/roles/configptf/tasks/configure_instance.yml index fc5f3fb5d5..209bddd7d1 100644 --- a/playbooks/roles/configptf/tasks/configure_instance.yml +++ b/playbooks/roles/configptf/tasks/configure_instance.yml @@ -1,9 +1,5 @@ --- # this playbook call bin/zowe-configure-instance.sh to create instance - -- name: Dump env (debug) - raw: env - - name: Create Zowe instance import_role: name: zos diff --git a/playbooks/roles/configptf/tasks/install_proc.yml b/playbooks/roles/configptf/tasks/install_proc.yml index c01cf6c7fa..cc7d246b74 100644 --- a/playbooks/roles/configptf/tasks/install_proc.yml +++ b/playbooks/roles/configptf/tasks/install_proc.yml @@ -7,4 +7,4 @@ vars: script_chdir: "{{ zowe_root_dir }}/scripts/utils" script_filename: ./zowe-install-proc.sh - script_parameters: "\"{{ zowe_dataset_prefix }}\" \"{{ zowe_proclib_dsname }}\"" \ No newline at end of file + script_parameters: -d {{ zowe_dataset_prefix }} -r {{ zowe_proclib_dsname }} diff --git a/playbooks/roles/configptf/tasks/install_xmem_server.yml b/playbooks/roles/configptf/tasks/install_xmem_server.yml index a2a3401f36..477f9051db 100644 --- a/playbooks/roles/configptf/tasks/install_xmem_server.yml +++ b/playbooks/roles/configptf/tasks/install_xmem_server.yml @@ -31,7 +31,7 @@ vars: script_chdir: "{{ zowe_root_dir }}/scripts/utils" script_filename: ./zowe-install-xmem.sh - script_parameters: "\"{{ zowe_dataset_prefix }}\" \"{{ zowe_xmem_loadlib }}\" \"{{ zowe_xmem_parmlib }}\" \"{{ zowe_xmem_proclib }}\"" + script_parameters: -d {{ zowe_xmem_loadlib }} -a {{ zowe_xmem_parmlib }} -r {{ zowe_xmem_proclib }} - name: Show content of ZSS proc {{ zowe_xmem_proclib_member_zss }} raw: cat "//'{{ zowe_xmem_proclib }}({{ zowe_xmem_proclib_member_zss }})'" diff --git a/playbooks/roles/ptf/tasks/is_ptf_installed.yml b/playbooks/roles/ptf/tasks/is_ptf_installed.yml index f55337f3a4..5255130854 100644 --- a/playbooks/roles/ptf/tasks/is_ptf_installed.yml +++ b/playbooks/roles/ptf/tasks/is_ptf_installed.yml @@ -53,6 +53,10 @@ file_upload_method: scp file_upload_hashcheck: false +- name: Convert ascii to ebcdic + when: convert_upload|default(False) + raw: iconv -f ISO8859-1 -t IBM-1047 "{{ work_dir_remote }}/LSTFMID.jcl" > "{{ work_dir_remote }}/LSTFMID.jcl.ebcdic" && mv "{{ work_dir_remote }}/LSTFMID.jcl.ebcdic" "{{ work_dir_remote }}/LSTFMID.jcl" + # ============================================================================ # Run LSTFMID.jcl - name: Run LSTFMID.jcl diff --git a/playbooks/roles/ptf/tasks/main.yml b/playbooks/roles/ptf/tasks/main.yml index f57e01ebc3..e3d9c45d6f 100644 --- a/playbooks/roles/ptf/tasks/main.yml +++ b/playbooks/roles/ptf/tasks/main.yml @@ -64,6 +64,17 @@ file_upload_hashcheck: false loop: "{{ zowe_ptf_install_jcls }}" +# ============================================================================ +# Convert uploaded JCLs in remote workspace if necessary +- name: (Optional) convert PTF installation JCLs + vars: + filename: "{{ item }}.jcl" + loop: "{{ zowe_ptf_install_jcls }}" + when: convert_upload|default(False) + raw: iconv -f ISO8859-1 -t IBM-1047 "{{ work_dir_remote }}/{{ filename }}" > "{{ work_dir_remote }}/{{ filename }}.ebcdic" && mv "{{ work_dir_remote }}/{{ filename }}.ebcdic" "{{ work_dir_remote }}/{{ filename }}" + + + - name: Fix JCLs is we only have 1 PTF when: zowe_smpe_ptf_2 == "" block: @@ -129,12 +140,12 @@ mode: 0700 delegate_to: localhost -- import_role: - name: zos - tasks_from: upload_and_run_script - vars: - upload_and_run_script_filename: install-SMPE-SYSMOD.sh - upload_and_run_script_parameters: "\"{{ zowe_smpe_hlq_dsn }}\" \"{{ zowe_smpe_hlq_csi }}\" \"{{ (zowe_smpe_dir_prefix is regex(\"/$\")) | ternary(zowe_smpe_dir_prefix, zowe_smpe_dir_prefix + \"/\") }}\" \"{{ work_dir_remote }}\" \"{{ zowe_smpe_fmid }}\" \"{{ zowe_smpe_ptf }}\" \"{{ zowe_smpe_ptf_2 }}\" \"{{ zowe_smpe_volser }}\" install" +#- import_role: +# name: zos +# tasks_from: upload_and_run_script +# vars: +# upload_and_run_script_filename: install-SMPE-SYSMOD.sh +# upload_and_run_script_parameters: "\"{{ zowe_smpe_hlq_dsn }}\" \"{{ zowe_smpe_hlq_csi }}\" \"{{ (zowe_smpe_dir_prefix is regex(\"/$\")) | ternary(zowe_smpe_dir_prefix, zowe_smpe_dir_prefix + \"/\") }}\" \"{{ work_dir_remote }}\" \"{{ zowe_smpe_fmid }}\" \"{{ zowe_smpe_ptf }}\" \"{{ zowe_smpe_ptf_2 }}\" \"{{ zowe_smpe_volser }}\" install" - name: Check if the first PTF is installed properly block: From e97ba1221929cf23e15034593a66f5c0e2d4f896 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 12 Jun 2024 07:58:30 -0400 Subject: [PATCH 30/31] update zowe version for staging 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 9cf904e6c1..d38ee5de90 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -1,6 +1,6 @@ { "name": "Zowe", - "version": "1.28.7", + "version": "1.28.8", "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 e7d674e7f44ed7df696f78cb51b63358d8039ee6 Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Wed, 12 Jun 2024 08:00:01 -0400 Subject: [PATCH 31/31] fix manifest for staging Signed-off-by: MarkAckert --- manifest.json.template | 196 ++++++++++++++++++++--------------------- 1 file changed, 96 insertions(+), 100 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index d38ee5de90..b6a3abc2d0 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -12,67 +12,56 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "1.28.7-V1.X-RC", - "repository": "libs-snapshot-local", - "artifact": "zlux-core-1.28.7-20240530.151858.pax" + "version": "~1.28.2-V1.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.zss-auth": { - "version": "1.28.7-V1.X-RC", - "repository": "libs-snapshot-local", - "artifact": "zss-auth-1.28.7-20240530.151032.pax" + "version": "~1.28.2-V1.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.sample-angular-app": { - "version": "1.28.7-V1.X-RC", - "repository": "libs-snapshot-local", - "artifact": "sample-angular-app-1.28.7-20240530.151138.pax" + "version": "~1.28.2-V1.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.sample-iframe-app": { - "version": "1.28.7-V1.X-RC", - "repository": "libs-snapshot-local", - "artifact": "sample-iframe-app-1.28.7-20240530.151016.pax" + "version": "~1.28.2-V1.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.sample-react-app": { - "version": "1.28.7-V1.X-RC", - "repository": "libs-snapshot-local", - "artifact": "sample-react-app-1.28.7-20240530.151124.pax" + "version": "~1.28.2-V1.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.tn3270-ng2": { - "version": "1.28.7-V1.X-RC", - "repository": "libs-snapshot-local", - "artifact": "tn3270-ng2-1.28.7-20240530.014242.pax" + "version": "~1.28.2-V1.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.vt-ng2": { - "version": "1.28.7-V1.X-RC", - "repository": "libs-snapshot-local", - "artifact": "vt-ng2-1.28.7-20240530.151040.pax" + "version": "~1.28.2-V1.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.zlux-editor": { - "version": "1.28.7-V1.X-RC", - "repository": "libs-snapshot-local", - "artifact": "zlux-editor-1.28.7-20240530.151320.pax" + "version": "~1.28.2-V1.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.zlux-workflow": { - "version": "1.28.7-V1.X-RC", - "repository": "libs-snapshot-local", - "artifact": "zlux-workflow-1.28.7-20240530.151205.pax" + "version": "~1.28.2-V1.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zlux.zosmf-auth": { - "version": "1.28.7-V1.X-RC", - "repository": "libs-snapshot-local", - "artifact": "zosmf-auth-1.28.7-20240530.154904.pax" + "version": "~1.28.2-V1.X-STAGING", + "artifact": "*.pax" }, "org.zowe.zss": { - "version": "1.28.7-RC", - "repository": "libs-snapshot-local", - "artifact": "zss-1.28.7-rc-1142-20240529170519.pax" + "version": "~1.28.2-STAGING", + "artifact": "*.pax" }, "org.zowe.explorer.jobs.jobs-api-package": { - "version": "1.0.24", + "version": "^1.0.0-SNAPSHOT", "artifact": "jobs-api-package-*.zip", "exclusions": ["*PR*.zip","*BRANCH*"] }, "org.zowe.explorer.files.files-api-package": { - "version": "1.0.26", + "version": "^1.0.0-SNAPSHOT", "artifact": "files-api-package-*.zip", "exclusions": ["*PR*.zip","*BRANCH*"] }, @@ -93,28 +82,34 @@ "artifact": "*.pax" }, "org.zowe.apiml.sdk.api-catalog-package": { - "version": "1.28.26", - "artifact": "api-catalog*.zip" + "version": "~1.28.0-SNAPSHOT", + "artifact": "api-catalog-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.discovery-package": { - "version": "1.28.26", - "artifact": "discovery*.zip" + "version": "~1.28.0-SNAPSHOT", + "artifact": "discovery-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.gateway-package": { - "version": "1.28.26", - "artifact": "gateway*.zip" + "version": "~1.28.0-SNAPSHOT", + "artifact": "gateway-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.caching-service-package": { - "version": "1.28.26", - "artifact": "caching-service*.zip" + "version": "~1.28.0-SNAPSHOT", + "artifact": "caching-service-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.metrics-service-package": { - "version": "1.28.26", - "artifact": "metrics-service*.zip" + "version": "~1.28.0-SNAPSHOT", + "artifact": "metrics-service-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.apiml-common-lib-package": { - "version": "1.28.26", - "artifact": "apiml-common-lib-*.zip" + "version": "~1.28.0-SNAPSHOT", + "artifact": "apiml-common-lib-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.common-java-lib-package": { "version": "~1.21.3-SNAPSHOT", @@ -122,8 +117,9 @@ "exclusions": ["*PR*.zip"] }, "org.zowe.apiml.sdk.apiml-sample-extension-package": { - "version": "1.28.26", - "artifact": "apiml-sample-extension-*.zip" + "version": "~1.28.0-SNAPSHOT", + "artifact": "apiml-sample-extension-*.zip", + "exclusions": ["*PR*.zip"] }, "org.zowe.launcher": { "version": "~0.0.3-SNAPSHOT" @@ -145,30 +141,30 @@ } }, "sourceDependencies": [ - { + { "componentGroup": "Zowe API Mediation Layer", "entries": [{ "repository": "api-layer", - "tag": "v1.28.25", + "tag": "v1.x.x", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe common java libraries", "entries": [{ "repository": "common-java", - "tag": "v1.21.3", + "tag": "v1", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Application Framework", "entries": [{ "repository": "zlux-app-manager", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-app-server", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }, { @@ -183,17 +179,17 @@ }, { "repository": "zlux-platform", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-server-framework", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zlux-shared", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }, { @@ -203,17 +199,17 @@ }, { "repository": "zlux-build", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zss", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zowe-common-c", - "tag": "zss-v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] } ] @@ -221,21 +217,21 @@ "componentGroup": "Zowe CLI", "entries": [{ "repository": "zowe-cli", - "tag": "v6.40.28", + "tag": "zowe-v1-lts", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® CICS® Plug-in for Zowe CLI", "entries": [{ - "repository": "cics-for-zowe-client", - "tag": "v4.0.11", + "repository": "zowe-cli-cics-plugin", + "tag": "zowe-v1-lts", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® Db2® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-db2-plugin", - "tag": "v4.1.13", + "tag": "zowe-v1-lts", "destinations": ["Zowe CLI Package"] }] }, { @@ -249,28 +245,28 @@ "componentGroup": "IBM® MQ Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-mq-plugin", - "tag": "v2.0.4", + "tag": "zowe-v1-lts", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "Secure Credential Store Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-scs-plugin", - "tag": "v4.1.12", + "tag": "master", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "z/OS® FTP Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ftp-plugin", - "tag": "v1.8.8", + "tag": "zowe-v1-lts", "destinations": ["Zowe CLI Package"] }] }, { "componentGroup": "IBM® IMS® Plug-in for Zowe CLI", "entries": [{ "repository": "zowe-cli-ims-plugin", - "tag": "v2.0.5", + "tag": "zowe-v1-lts", "destinations": ["Zowe CLI Package"] }] }, { @@ -291,53 +287,53 @@ "componentGroup": "Zowe Desktop JES UI Plugin", "entries": [{ "repository": "explorer-jes", - "tag": "v1.0.23", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Web Plug-in Server", "entries": [{ "repository": "explorer-ui-server", - "tag": "v0.2.19", + "tag": "staging", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop z/OS Unix Files UI Plugin", "entries": [{ "repository": "explorer-uss", - "tag": "v1.0.23", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Common REST Server", "entries": [{ "repository": "explorer-api-common", - "tag": "1.1.20", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Data Sets REST Server", "entries": [{ "repository": "data-sets", - "tag": "1.0.26", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Explorer Jobs REST Server", "entries": [{ "repository": "jobs", - "tag": "1.0.24", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Application Framework Authentication Handlers", "entries": [{ "repository": "zss-auth", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }, { "repository": "zosmf-auth", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -345,14 +341,14 @@ "componentGroup": "Zowe Desktop TN3270 Emulator Plug-in", "entries": [{ "repository": "tn3270-ng2", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }] }, { "componentGroup": "Zowe Desktop Sample Angular Application", "entries": [{ "repository": "sample-angular-app", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -360,7 +356,7 @@ "componentGroup": "Zowe Desktop Sample iFrame Application", "entries": [{ "repository": "sample-iframe-app", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -368,7 +364,7 @@ "componentGroup": "Zowe Desktop Sample React Application", "entries": [{ "repository": "sample-react-app", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -376,7 +372,7 @@ "componentGroup": "Zowe Desktop VT Emulator Plugin-in", "entries": [{ "repository": "vt-ng2", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -384,7 +380,7 @@ "componentGroup": "Zowe Desktop Editor Plugin-in", "entries": [{ "repository": "zlux-editor", - "tag": "v1.28.7-RC1", + "tag": "v1.x/staging", "destinations": ["Zowe PAX"] }] }, @@ -392,7 +388,7 @@ "componentGroup": "Zowe Desktop Workflows Plugin-in", "entries": [{ "repository": "zlux-workflow", - "tag": "v1.28.7-RC1", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }] }, @@ -400,15 +396,15 @@ "componentGroup": "Utilities", "entries": [{ "repository": "keyring-utilities", - "tag": "v1.0.4", + "tag": "master", "destinations": ["Zowe PAX"] }, { "repository": "zowe-install-packaging-tools", - "tag": "v0.0.13", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }, { "repository": "launcher", - "tag": "v0.0.10", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }] }, @@ -424,73 +420,73 @@ "componentGroup": "Zowe Desktop IP Explorer Plug-in", "entries": [{ "repository": "explorer-ip", - "tag": "v1.0.0", + "tag": "v1.x/master", "destinations": ["Zowe PAX"] }] } ], "imageDependencies": { "zowe-launch-scripts": { - "registry": "zowe-docker-release.jfrog.io", + "registry": "zowe-docker-snapshot.jfrog.io", "name": "ompzowe/zowe-launch-scripts", - "tag" : "1.28.6-ubuntu" + "tag" : "1.25.0-ubuntu.staging" }, "api-catalog": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/api-catalog-services", - "tag" : "1.28.26-ubuntu" + "tag" : "1-ubuntu" }, "caching": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/caching-service", - "tag" : "1.28.26-ubuntu" + "tag" : "1-ubuntu" }, "discovery": { "kind": "statefulset", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/discovery-service", - "tag" : "1.28.26-ubuntu" + "tag" : "1-ubuntu" }, "gateway": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/gateway-service", - "tag" : "1.28.26-ubuntu" + "tag" : "1-ubuntu" }, "app-server": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/app-server", - "tag" : "1.28.7-ubuntu" + "tag" : "1-ubuntu" }, "explorer-ip": { "kind": "job", "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-ip", - "tag" : "1.0.1-ubuntu" + "tag" : "1-ubuntu" }, "explorer-jes": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-jes", - "tag" : "1.0.23-ubuntu" + "tag" : "1-ubuntu" }, "explorer-mvs": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-mvs", - "tag" : "1.0.21-ubuntu" + "tag" : "1-ubuntu" }, "explorer-uss": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/explorer-uss", - "tag" : "1.0.23-ubuntu" + "tag" : "1-ubuntu" }, "files-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/files-api", - "tag" : "1.0.25-ubuntu" + "tag" : "1-ubuntu" }, "jobs-api": { "registry": "zowe-docker-release.jfrog.io", "name": "ompzowe/jobs-api", - "tag" : "1.0.23-ubuntu" + "tag" : "1-ubuntu" } }, "dependencyDecisions": {