Merge pull request #4050 from zowe/user/markackert/1.28.8-rc-to-master

1.28.8 release - rc to master

.github/scripts/cicd_test/prep7_more_test_prep/05_process_ext_list.sh

@@ -35,11 +35,12 @@ if [[ "$MATRIX_TEST" == *"install-ext"* ]]; then
         if [[ "$each_ext" == *"("* ]] && [[ "$each_ext" == *")"* ]] ; then
             # user provides custom artifactory pattern
             ext_name=$(echo "$each_ext" | cut -d "(" -f1)
-            ext_pattern=$(echo "$each_ext" | cut -d "(" -f2 | cut -d ")" -f1)
+            ext_version=$(echo "$each_ext" | cut -d "(" -f2 | cut -d ")" -f1)
+            ext_pattern=$(echo "$DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN" | sed "s#{ext-name}#$ext_name#g" | sed "s#{ext-version}#$ext_version#g" )
         else
             # use default
             ext_name="$each_ext"
-            ext_pattern=$(echo "$DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN" | sed "s#{ext-name}#$ext_name#g")
+            ext_pattern=$(echo "$DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN" | sed "s#{ext-name}#$ext_name#g" | sed "s#{ext-version}#*#g" )
         fi
 
         echo "[Check 4 INFO] extension name is $ext_name"
@@ -58,4 +59,4 @@ if [[ "$MATRIX_TEST" == *"install-ext"* ]]; then
     EXTENSION_LIST=$(echo $EXTENSION_LIST | sed 's/;$//g')
     assert_env_var EXTENSION_LIST
     printf "${GREEN}[Check 4/$TOTAL_CHECK] Zowe extension list processing complete!${NC}\n"
-fi
+fi

.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:

.github/workflows/cicd-test-readme.md

@@ -102,7 +102,7 @@ Background: CICD testing relies on a `zowe.pax` or `zowe-smpe.zip` (for SMPE ins
 
 - This input is pre-filled with `sample-node-api;sample-trial-app` to test [sample-node-api](https://github.com/zowe/sample-node-api) and [sample-trial-app](https://github.com/zowe/sample-trial-app) projects. In normal circumstances, you probably don't need to modify the pre-filled value here.
 - By default, the extension artifact search pattern is using format `libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax` where `{ext-name}` will be processed and substituted from this input (as an example above, `sample-node-api`). Then the latest uploaded artifact will be used.
-- Optionally, you can customized your extension artifact path. Customized jfrog artifactory path should exist, be valid, and enclosed in brackets and put after the extension name, eg. `sample-node-api(my/new/path/sample-node-api-cus.pax)`. A pattern contains `*` is also supported, which the latest artifact will be picked up. If multiple extensions are included, make sure to separate them by semi-colon. In addition to the artifactory path/pattern, you can also put a full http URL to any other remote location that points to an extension pax here.
+- Optionally, you can customized your extension artifact version. Customized jfrog artifactory version should exist, be valid, and enclosed in brackets and put after the extension name, eg. `sample-node-api(3.0.0-SNAPSHOT)`. This example will create a search pattern like the following, where the latest artifact in the folder is picked up: `libs-snapshot-local/org/zowe/sample-node-api/3.0.0-SNAPSHOT/sample-node-api-*.pax`.  A pattern containing `*` is also supported, which will result in the latest artifact in the latest folder matching the pattern. For example: `sample-node-api(1.0.0-*)` will create this search pattern: `libs-snapshot-local/org/zowe/sample-node-api/1.0.0-*/sample-node-api-*.pax`, which could match folders `1.0.0-SNAPSHOT`, `1.0.0-MAIN`, `1.0.0-user-pr-build`, etc.
 - The following regular expression will be used to check against your input
 
   ```

.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:
@@ -42,7 +49,9 @@ on:
       custom-extension-list:
         description: 'Custom Extension List:'
         required: false
-        default: 'sample-node-api;sample-trial-app'
+        # FIXME: too slow to test 2, temporarily only test 1
+        # default: 'sample-node-api;sample-trial-app'
+        default: 'sample-node-api(1.0.0-SNAPSHOT)'
       RANDOM_DISPATCH_EVENT_ID:
         description: 'random dispatch event id'
         required: false
@@ -57,7 +66,7 @@ env:
   DEFAULT_ZOWE_SMPE_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/*zowe-smpe*{branch-name}*.zip
   DEFAULT_ZOWE_TP_DOCKER_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/*server-bundle.amd64*{branch-name}*.tar
   DEFAULT_ZOWE_CLI_ARTIFACTORY_PATTERN: PLACE_HOLDER/org/zowe/cli/zowe-cli-package/*/zowe-cli-package-1*.zip
-  DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax
+  DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/{ext-version}/{ext-name}-*.pax
 
   # can be overwritten, adjusted by DevOps only
   ZOS_NODE_VERSION: v16.20.2

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

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