Merge branch 'v1.x/rc' into v1.28.8/cli/rc

zowe · Oct 3, 2024 · a153fad · a153fad
2 parents 7814d2b + 65129b0
commit a153fad
Show file tree

Hide file tree

Showing 10 changed files with 109 additions and 12 deletions.
diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml
@@ -1,4 +1,11 @@
 name: Zowe Build and Packaging
+
+permissions:
+  id-token: write
+  issues: write
+  pull-requests: write
+  contents: write
+
 on:
   push:
     branches:

diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml
@@ -1,4 +1,11 @@
 name: Zowe CICD Integration Tests
+
+permissions:
+  id-token: write
+  issues: write
+  pull-requests: write
+  contents: write
+
 on:   
   workflow_dispatch:
     inputs:

diff --git a/containers/kubernetes/workloads/instance-env/cleanup-static-definitions-cronjob.yaml b/containers/kubernetes/workloads/instance-env/cleanup-static-definitions-cronjob.yaml
@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cleanup-static-definitions

diff --git a/containers/kubernetes/workloads/zowe-yaml/cleanup-static-definitions-cronjob.yaml b/containers/kubernetes/workloads/zowe-yaml/cleanup-static-definitions-cronjob.yaml
@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: cleanup-static-definitions

diff --git 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",
@@ -145,14 +145,7 @@
     }
   },
   "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",

diff --git a/smpe/bld/service/promoted-apar.txt b/smpe/bld/service/promoted-apar.txt
@@ -1,3 +1,6 @@
+IO29436
+IO29437
+IO29438
 IO29352
 IO29353
 IO29354

diff --git a/smpe/bld/service/promoted-close.txt b/smpe/bld/service/promoted-close.txt
@@ -1,3 +1,48 @@
+    IO29436 -
+      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.7.
+      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/
+
+    IO29437 -
+      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.7.
+      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/
+
+    IO29438 -
+      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.7.
+      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/
+
     IO29352 -
       PROBLEM SUMMARY:
       ****************************************************************

diff --git a/smpe/bld/service/promoted-hold.txt b/smpe/bld/service/promoted-hold.txt
@@ -1,3 +1,41 @@
+++HOLD(UO90063) SYSTEM FMID(AZWE001) REASON(ACTION) DATE(24162)
+  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(UO90051) SYSTEM FMID(AZWE001) REASON(ACTION) DATE(24102)
   COMMENT(
   ****************************************************************

diff --git a/smpe/bld/service/promoted-ptf.txt b/smpe/bld/service/promoted-ptf.txt
@@ -1,3 +1,5 @@
+UO90063
+UO90064
 UO90051
 UO90052
 UO90038

diff --git a/smpe/bld/service/ptf-bucket.txt b/smpe/bld/service/ptf-bucket.txt
@@ -28,4 +28,6 @@
 #UO90028 UO90029 - IO29223 IO29224  IO29226 - Fri Jun 30 19:01:43 UTC 2023
 #UO90038 UO90039 - IO29305 IO29306  IO29307 - Wed Oct 11 20:17:16 UTC 2023
 #UO90051 UO90052 - IO29352 IO29353  IO29354 - Thu Apr 11 21:48:44 UTC 2024
-UO90063 UO90064 - IO29436 IO29437  IO29438
+#UO90063 UO90064 - IO29436 IO29437  IO29438 - Mon Jun 10 20:42:08 UTC 2024
+UO90067 UO90068 - IO29442 IO29443  IO29444
+UO90069 UO90070 - IO29445 IO29446  IO29447
-Original file line number
+Diff line change
@@ -1,3 +1,6 @@
+    IO29436
+    IO29437
+    IO29438
     IO29352
     IO29353
     IO29354
@@ Expand Down @@