Merge pull request #3592 from zowe/users/oscar/zowe1.28.5mergestaging…

…toRC Merge 1.28.5 staging to rc
zowe · Oct 5, 2023 · 6d9d79b · 6d9d79b
2 parents a8c3b42 + 0bb82d2
commit 6d9d79b
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 20 deletions.
diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh
@@ -36,10 +36,6 @@ case $install_test_choice in
   test_file="$KEYRING_TESTFILE"
   ;;
 
-"z/OS node v14")
-  test_file="$ZOS_NODE_V14_TESTFILE"
-  ;;
-
 "z/OS node v16")
   test_file="$ZOS_NODE_V16_TESTFILE"
   ;;

diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md
@@ -30,7 +30,6 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin
   - Tech Preview Docker
   - Extensions
   - Keyring
-  - z/OS node v14
   - z/OS node v16
   - Non-strict Verify External Certificate
   - Install PTF twice
@@ -121,7 +120,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins
 When running CICD integration tests during RC stage, the following string will be parsed into the Github Actions matrix. As a result, a total of 19 independent jobs will be spawned.
 
 ```
-basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-docker.ts(zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v14.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v16.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02);extended/caching-storages/infinispan-storage.ts
+basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-docker.ts(zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v16.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02);extended/caching-storages/infinispan-storage.ts
 ```
 
 Total elapsed time when running in parallel is approximately 3.5 hours on paper idealy if all parallel jobs are executing at the same time. In reality, from numerous tests performed, total elapsed time is around 4 hours.  
@@ -135,7 +134,6 @@ Selected test running elapsed time:
 | SMPE PTF | 47m |
 | Tech Preview Docker | 22m |
 | z/OS node v16 | 25m |
-| z/OS node v14 | 25m |
 | Keyring | 27m |
 | Non-strict Verify External Certificate | 25m |
 | Extensions | 35m

diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml
@@ -25,7 +25,6 @@ on:
           - Tech Preview Docker
           - Extensions
           - Keyring
-          - z/OS node v14
           - z/OS node v16
           - Non-strict Verify External Certificate
           - Install PTF Twice
@@ -74,14 +73,13 @@ env:
   TECH_PREVIEW_DOCKER_TESTFILE: basic/install-docker.ts
   EXTENSIONS_TESTFILE: basic/install-ext.ts
   KEYRING_TESTFILE: extended/keyring.ts
-  ZOS_NODE_V14_TESTFILE: extended/node-versions/node-v14.ts
   ZOS_NODE_V16_TESTFILE: extended/node-versions/node-v16.ts
   NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE: extended/certificates/nonstrict-verify-external-certificate.ts
   INSTALL_PTF_TWICE_TESTFILE: extended/install-ptf-two-times.ts
   VSAM_CACHING_STORAGE_METHOD_TESTFILE: extended/caching-storages/vsam-storage.ts
   INFINISPAN_CACHING_STORAGE_METHOD_TESTFILE: extended/caching-storages/infinispan-storage.ts
   GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts
-  ZOWE_RELEAE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-docker.ts(any);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v16.ts(all);extended/node-versions/node-v14.ts(all);extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any)
+  ZOWE_RELEAE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-docker.ts(any);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v16.ts(any);extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any)
   ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-docker.ts(any)
 
 jobs:
@@ -294,9 +292,6 @@ jobs:
               case 'Keyring':
                 eta = 27
                 break;
-              case 'z/OS node v14':
-                eta = 25
-                break;
               case 'z/OS node v16':
                 eta = 25
                 break;

diff --git a/manifest.json.template b/manifest.json.template
@@ -419,7 +419,7 @@
       "componentGroup": "Zowe Visual Studio Code Extension",
       "entries": [{
         "repository": "vscode-extension-for-zowe",
-        "tag": "v1.22.3",
+        "tag": "v1.22.5",
         "destinations": ["Visual Studio Code Marketplace"]
       }]
     },
@@ -436,28 +436,28 @@
     "zowe-launch-scripts": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/zowe-launch-scripts",
-      "tag" : "1.28.4-ubuntu"
+      "tag" : "1.28.5-ubuntu"
     },
     "api-catalog": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/api-catalog-services",
-      "tag" : "1.28.23-ubuntu"
+      "tag" : "1.28.24-ubuntu"
     },
     "caching": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/caching-service",
-      "tag" : "1.28.23-ubuntu"
+      "tag" : "1.28.24-ubuntu"
     },
     "discovery": {
       "kind": "statefulset",
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/discovery-service",
-      "tag" : "1.28.23-ubuntu"
+      "tag" : "1.28.24-ubuntu"
     },
     "gateway": {
       "registry": "zowe-docker-release.jfrog.io",
       "name": "ompzowe/gateway-service",
-      "tag" : "1.28.23-ubuntu"
+      "tag" : "1.28.24-ubuntu"
     },
     "app-server": {
       "registry": "zowe-docker-release.jfrog.io",

diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt
@@ -1,3 +1,6 @@
+IO29223
+IO29224
+IO29226
 IO28762
 IO28763
 IO28886

diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt
@@ -1,3 +1,48 @@
+    IO29223 -
+      PROBLEM SUMMARY:
+      ****************************************************************
+      * USERS AFFECTED: All Zowe users                               *
+      ****************************************************************
+      * PROBLEM DESCRIPTION: Update Zowe FMID AZWE001 to match the   *
+      *                      community release                       *
+      ****************************************************************
+      * RECOMMENDATION: Apply provided service                       *
+      ****************************************************************
+      The Zowe community version was updated to 1.28.4.
+      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/
+
+    IO29224 -
+      PROBLEM SUMMARY:
+      ****************************************************************
+      * USERS AFFECTED: All Zowe users                               *
+      ****************************************************************
+      * PROBLEM DESCRIPTION: Update Zowe FMID AZWE001 to match the   *
+      *                      community release                       *
+      ****************************************************************
+      * RECOMMENDATION: Apply provided service                       *
+      ****************************************************************
+      The Zowe community version was updated to 1.28.4.
+      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/
+
+    IO29226 -
+      PROBLEM SUMMARY:
+      ****************************************************************
+      * USERS AFFECTED: All Zowe users                               *
+      ****************************************************************
+      * PROBLEM DESCRIPTION: Update Zowe FMID AZWE001 to match the   *
+      *                      community release                       *
+      ****************************************************************
+      * RECOMMENDATION: Apply provided service                       *
+      ****************************************************************
+      The Zowe community version was updated to 1.28.4.
+      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/
+
     IO28762 -
       PROBLEM SUMMARY:
       ****************************************************************

diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt
@@ -1,3 +1,41 @@
+++HOLD(UO90028) SYSTEM FMID(AZWE001) REASON(ACTION) DATE(23181)
+  COMMENT(
+  ****************************************************************
+  * Affected function: Zowe configuration                        *
+  ****************************************************************
+  * Description: redo configuration                              *
+  ****************************************************************
+  * Timing: post-APPLY                                           *
+  ****************************************************************
+  * Part: instance directory                                     *
+  ****************************************************************
+  New changes are made to instance directory bin folder.
+  Run <ROOT_DIR>/bin/zowe-configure-instance.sh -c
+  <PATH_TO_INSTANCE_DIR> again.
+
+  ****************************************************************
+  * Affected function: Zowe servers                              *
+  ****************************************************************
+  * Description: stop servers                                    *
+  ****************************************************************
+  * Timing: pre-APPLY                                            *
+  ****************************************************************
+  * Part: ZWESVSTC & ZWESISTC                                    *
+  ****************************************************************
+  Stop the Zowe servers before installing this update.
+
+  ****************************************************************
+  * Affected function: Zowe servers                              *
+  ****************************************************************
+  * Description: start servers                                   *
+  ****************************************************************
+  * Timing: post-APPLY                                           *
+  ****************************************************************
+  * Part: ZWESVSTC or ZWESLSTC, and ZWESISTC                     *
+  ****************************************************************
+  Start the Zowe servers after installing this update.
+
+  ).
 ++HOLD(UO02029) SYSTEM FMID(AZWE001) REASON(ACTION) DATE(23096)
   COMMENT(
   ****************************************************************

diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt
@@ -1,3 +1,5 @@
+UO90028
+UO90029
 UO02029
 UO02030
 UO02027

diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt
@@ -25,4 +25,5 @@
 #UO02025 UO02026 - IO28758 IO28759  IO28884 - Tue Aug 30 02:34:07 UTC 2022
 #UO02027 UO02028 - IO28760 IO28761  IO28885 - Tue Nov 29 16:22:03 UTC 2022
 #UO02029 UO02030 - IO28762 IO28763  IO28886 - Thu Apr  6 14:57:22 UTC 2023
-UO90028 UO90029 - IO29223 IO29224  IO29226
+#UO90028 UO90029 - IO29223 IO29224  IO29226 - Fri Jun 30 19:01:43 UTC 2023
+UO90038 UO90039 - IO29305 IO29306  IO29307
-Original file line number
+Diff line change
@@ -1,3 +1,6 @@
+    IO29223
+    IO29224
+    IO29226
     IO28762
     IO28763
     IO28886
@@ Expand Down @@