Merge v2.x/staging into RC for 2.13.0 (#3667)

* Remove node 14 support node 14 is no longer supported. our documentation says so Signed-off-by: 1000TurquoisePogs <[email protected]> * Update node.sh Signed-off-by: 1000TurquoisePogs <[email protected]> * Update cicd-test.yml Signed-off-by: 1000TurquoisePogs <[email protected]> * Update cicd-test-readme.md Signed-off-by: 1000TurquoisePogs <[email protected]> * Update make_matrix.sh Signed-off-by: 1000TurquoisePogs <[email protected]> * Update node.sh Signed-off-by: 1000TurquoisePogs <[email protected]> * Tracing messages with correct function names (#3619) Signed-off-by: Martin Zeithaml <[email protected]> * Replace introspect URL with JWK for OIDC validation (#3614) * Replace introspect url with JWK Signed-off-by: at670475 <[email protected]> * fix name Signed-off-by: at670475 <[email protected]> * temporary change to test Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * fix Signed-off-by: at670475 <[email protected]> * revert back the manifest.json Signed-off-by: at670475 <[email protected]> --------- Signed-off-by: at670475 <[email protected]> Co-authored-by: Mark Ackert <[email protected]> * Ensure workflow files are in ascii in final PAX (#3593) * build: convert workflow files to ascii before paxing Signed-off-by: MarkAckert <[email protected]> * chore: add changelog Signed-off-by: MarkAckert <[email protected]> * build: adjust dir base Signed-off-by: MarkAckert <[email protected]> * build: remove quotes from ls command Signed-off-by: MarkAckert <[email protected]> * build: fix quotes in iconv Signed-off-by: MarkAckert <[email protected]> * deleted hyphen Signed-off-by: mm667937 <[email protected]> * script was trying to convert files that are in input directory but it was trying it from working directory Signed-off-by: mm667937 <[email protected]> * build: fix variable Signed-off-by: MarkAckert <[email protected]> * build: correct conversion script; use find instead of ls Signed-off-by: MarkAckert <[email protected]> * Have to convert all the workflows back to IBM-1047 before copy into dataset(not going into pswi, just test dir) Signed-off-by: mm667937 <[email protected]> * update changelog target version Signed-off-by: MarkAckert <[email protected]> --------- Signed-off-by: MarkAckert <[email protected]> Signed-off-by: mm667937 <[email protected]> Co-authored-by: mm667937 <[email protected]> * Formatting in general pattern (#3615) Signed-off-by: Martin Zeithaml <[email protected]> Co-authored-by: Mark Ackert <[email protected]> * add new PTF numbers Signed-off-by: ojcelis <[email protected]> * Promote PTF after release v2.12.0 Signed-off-by: zowe-robot <[email protected]> * updated PTF bucket Signed-off-by: ojcelis <[email protected]> * Update cicd-test-readme.md Signed-off-by: 1000TurquoisePogs <[email protected]> * Update cicd-test.yml Signed-off-by: 1000TurquoisePogs <[email protected]> * update zowe version to next release Signed-off-by: ojcelis <[email protected]> * build: remove node v14/v16 refs; cicd defaults to v16 Signed-off-by: MarkAckert <[email protected]> * Make example-zowe.yaml certificate scenarios more accurate Signed-off-by: Leanid Astrakou <[email protected]> * Add global and component level network configuration options (#3509) * Add global and component level network configuration options Signed-off-by: Timothy Gerstel <[email protected]> * Use zoweIpv4 for bind addresses and update tls settings to enums Signed-off-by: Timothy Gerstel <[email protected]> * Deduplicate schema and separate server from client Also change "bind" to "listen" and tls prefix with TLSv, as seen in the majority of our servers. Signed-off-by: 1000TurquoisePogs <[email protected]> * Fix schema json syntax Signed-off-by: 1000TurquoisePogs <[email protected]> * Shorten tlsSettings to tls, and fix plural ipAddresses Signed-off-by: 1000TurquoisePogs <[email protected]> --------- Signed-off-by: Timothy Gerstel <[email protected]> Signed-off-by: 1000TurquoisePogs <[email protected]> Co-authored-by: 1000TurquoisePogs <[email protected]> * Build: fix failing chown from build step (#3658) * build: remove failing chown from build step Signed-off-by: MarkAckert <[email protected]> * build: update mkdir to _cmd, chown _super to _cmd Signed-off-by: MarkAckert <[email protected]> * chore: update comment Signed-off-by: MarkAckert <[email protected]> --------- Signed-off-by: MarkAckert <[email protected]> * zzow system updates (#3651) * build: zzow04 to zzow08 Signed-off-by: MarkAckert <[email protected]> * build: add port Signed-off-by: MarkAckert <[email protected]> * build: remove explicit pax vars. action defaults updated. Signed-off-by: MarkAckert <[email protected]> * build: update marist system names Signed-off-by: MarkAckert <[email protected]> * chore: update playbook hosts Signed-off-by: MarkAckert <[email protected]> * chore: change ansible port for new systems Signed-off-by: MarkAckert <[email protected]> * test: update failing vt test; system response correct Signed-off-by: MarkAckert <[email protected]> * build: update PSWI builds for zzow07 Signed-off-by: MarkAckert <[email protected]> * chore: lint fix Signed-off-by: MarkAckert <[email protected]> * chore: update random gen to create 6,7,8 Signed-off-by: MarkAckert <[email protected]> * build: temporarily disable vt test Signed-off-by: MarkAckert <[email protected]> * build: comment out entire file (lint errors) Signed-off-by: MarkAckert <[email protected]> --------- Signed-off-by: MarkAckert <[email protected]> * Update TLS settings (#3659) * Update TLS settings Signed-off-by: 1000TurquoisePogs <[email protected]> * Update zowe-yaml-schema.json Signed-off-by: 1000TurquoisePogs <[email protected]> --------- Signed-off-by: 1000TurquoisePogs <[email protected]> Co-authored-by: Mark Ackert <[email protected]> * Add getesm to build (#3663) * Add getesm to build Signed-off-by: 1000TurquoisePogs <[email protected]> * Update README.md Signed-off-by: Martin Zeithaml <[email protected]> --------- Signed-off-by: 1000TurquoisePogs <[email protected]> Signed-off-by: Martin Zeithaml <[email protected]> Co-authored-by: Martin Zeithaml <[email protected]> * Reduce string fields by introducing better typing (#3617) * Reduce string fields by introducing better typing Signed-off-by: 1000TurquoisePogs <[email protected]> * Add new reusable types Signed-off-by: 1000TurquoisePogs <[email protected]> --------- Signed-off-by: 1000TurquoisePogs <[email protected]> Signed-off-by: Mark Ackert <[email protected]> Co-authored-by: Mark Ackert <[email protected]> * build: update zzow matrix generator (#3665) Signed-off-by: MarkAckert <[email protected]> * Added more clarification to example-zowe.yaml (#3660) * Added more clarification Signed-off-by: Leanid Astrakou <[email protected]> * 512 char --> 126 Signed-off-by: Leanid Astrakou <[email protected]> --------- Signed-off-by: Leanid Astrakou <[email protected]> Co-authored-by: ojcelis <[email protected]> Co-authored-by: Mark Ackert <[email protected]> Co-authored-by: 1000TurquoisePogs <[email protected]> --------- Signed-off-by: 1000TurquoisePogs <[email protected]> Signed-off-by: Martin Zeithaml <[email protected]> Signed-off-by: at670475 <[email protected]> Signed-off-by: MarkAckert <[email protected]> Signed-off-by: mm667937 <[email protected]> Signed-off-by: ojcelis <[email protected]> Signed-off-by: zowe-robot <[email protected]> Signed-off-by: ojcelis <[email protected]> Signed-off-by: Mark Ackert <[email protected]> Signed-off-by: Leanid Astrakou <[email protected]> Signed-off-by: Timothy Gerstel <[email protected]> Signed-off-by: Martin Zeithaml <[email protected]> Co-authored-by: 1000TurquoisePogs <[email protected]> Co-authored-by: Martin Zeithaml <[email protected]> Co-authored-by: Andrea Tabone <[email protected]> Co-authored-by: mm667937 <[email protected]> Co-authored-by: ojcelis <[email protected]> Co-authored-by: zowe-robot <[email protected]> Co-authored-by: ojcelis <[email protected]> Co-authored-by: Leanid Astrakou <[email protected]> Co-authored-by: Timothy Gerstel <[email protected]> Co-authored-by: Leanid Astrakou <[email protected]>
zowe · Nov 28, 2023 · af37abf · af37abf
1 parent 7140520
commit af37abf
Show file tree

Hide file tree

Showing 56 changed files with 613 additions and 418 deletions.
diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh
@@ -32,17 +32,9 @@ 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"
-  ;;
-
 "z/OS node v18")
   test_file="$ZOS_NODE_V18_TESTFILE"
-  test_force_system="zzow04"
+  test_force_system="zzow08"
   ;;
 
 "Non-strict Verify External Certificate")
@@ -91,17 +83,18 @@ if [[ ! -z "$test_force_system" ]]; then
 else
   if [[ -z "$dont_parse_test_server" ]]; then
     if [[ "$test_server" == "Any zzow servers" ]]; then
-      test_server="zzow0"$(echo $(($RANDOM % 3 + 2)))
+      test_server="zzow0"$(echo $(($RANDOM % 3 + 6)))
     fi
     TEST_FILE_SERVER="$test_file($test_server)"
   else
     any_occurrence=$(echo $test_file | grep -o "(any)" | wc -l)
     interim_test_file_server=$test_file
     for i in $(seq $any_occurrence); do
-      interim_test_file_server=$(echo $interim_test_file_server | sed "s#(any)#(zzow0$(echo $(($RANDOM % 3 + 2))))#")
+      # Generates zzow06, zzow07, zzow08
+      interim_test_file_server=$(echo $interim_test_file_server | sed "s#(any)#(zzow0$(echo $(($RANDOM % 3 + 6))))#")
     done
 
-    TEST_FILE_SERVER=$(echo $interim_test_file_server | sed "s#(all)#(zzow02,zzow03,zzow04)#g")
+    TEST_FILE_SERVER=$(echo $interim_test_file_server | sed "s#(all)#(zzow06,zzow07,zzow08)#g")
   fi
 fi
 

diff --git a/.github/scripts/cicd_test/prep7_more_test_prep/03_process_test_server.sh b/.github/scripts/cicd_test/prep7_more_test_prep/03_process_test_server.sh
@@ -14,24 +14,24 @@ TEST_SERVER=$(echo "$MATRIX_SERVER" | cut -d "-" -f2)
 
 case $TEST_SERVER in
 
-"zzow02")
-    TEST_SERVER_NICKNAME=marist-2
-    ;;
+"zzow06")
+  TEST_SERVER_NICKNAME=marist-6
+  ;;
 
-"zzow03")
-    TEST_SERVER_NICKNAME=marist-3
-    ;;
+"zzow07")
+  TEST_SERVER_NICKNAME=marist-7
+  ;;
 
-"zzow04")
-    TEST_SERVER_NICKNAME=marist-4
-    ;;
+"zzow08")
+  TEST_SERVER_NICKNAME=marist-8
+  ;;
 
 *)
-    printf "${RED}[Check 2 ERROR] Something went wrong when parsing test server nickname\n"
-    exit 1
-    ;;
+  printf "${RED}[Check 2 ERROR] Something went wrong when parsing test server nickname\n"
+  exit 1
+  ;;
 esac
 
 assert_env_var "TEST_SERVER"
 assert_env_var "TEST_SERVER_NICKNAME"
-printf "${GREEN}[Check 2/$TOTAL_CHECK] Test server name processing complete!${NC}\n"
+printf "${GREEN}[Check 2/$TOTAL_CHECK] Test server name processing complete!${NC}\n"
diff --git a/.github/workflows/build-packaging.yml b/.github/workflows/build-packaging.yml
@@ -171,7 +171,7 @@ jobs:
         with:
           manifest-file-path: ${{ github.workspace }}/manifest.json
           default-target-path: .pax/binaryDependencies/
-          expected-count: 29
+          expected-count: 30
 
       # this step is not doing a publish, we are just utilizing this actions to get the PUBLISH_TARGET_PATH, 
       # and it will be used in the next step: [Download 3] Download SMPE build log
@@ -236,7 +236,7 @@ jobs:
         with:
           lock-repository: ${{ github.repository }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          lock-resource-name: zowe-psi-build-zzow03-lock
+          lock-resource-name: zowe-psi-build-zzow07-lock
           lock-avg-retry-interval: 60
 
       - name: '[SMPE Pax 4] Build PSWI'
@@ -249,6 +249,7 @@ jobs:
         env:
           ZOSMF_USER: ${{ secrets.ZOWE_PSWI_BUILD_USR }}
           ZOSMF_PASS: ${{ secrets.ZOWE_PSWI_BUILD_PASSWD }}
+          ZZOW_SSH_PORT: ${{ secrets.SSH_MARIST_ALLSYS_PORT }}
           VERSION: ${{ env.P_VERSION }}
 
       - name: '[K8S] Build Kubernetes'

diff --git a/.github/workflows/cicd-test-readme.md b/.github/workflows/cicd-test-readme.md
@@ -4,9 +4,9 @@ This guide will describe how you should input into Github Actions workflow input
 
 Currently we support three testing z/OS servers:
 
-- zzow02 (ACF2)
-- zzow03 (Top Secret/TSS)
-- zzow04 (RACF)
+- zzow06 (ACF2)
+- zzow07 (Top Secret/TSS)
+- zzow08 (RACF)
 
 Testing pipeline is running tests in parallel. The workflow will try to acquire the resource lock if available. If the resource lock is occupied, the workflow will wait until the lock is succesfully acquired.
 
@@ -17,7 +17,7 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin
 ### Choose Test Server
 
 - This input is a choice, and it's mandatory.  
-- You can choose from one of `zzow02`, `zzow03`, `zzow04`, `zzow02,zzow03,zzow04` (if you want to run the test on all zzow servers), or `Any zzow servers` (pick any zzow servers, potentially help reduce wait time)
+- You can choose from one of `zzow06`, `zzow07`, `zzow08`, `zzow06,zzow07,zzow08` (if you want to run the test on all zzow servers), or `Any zzow servers` (pick any zzow servers, potentially help reduce wait time)
 - Default is `Any zzow servers`
 
 ### Choose Install Test
@@ -29,8 +29,6 @@ Workflow trigger is at [cicd-test](https://github.com/zowe/zowe-install-packagin
   - SMPE PTF
   - Extensions
   - Keyring
-  - z/OS node v14
-  - z/OS node v16
   - z/OS node v18
   - Non-strict Verify External Certificate
   - Install PTF twice
@@ -111,7 +109,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 21 independent jobs will be spawned.
 
 ```
-basic/install.ts(zzow02,zzow03,zzow04);basic/install-ptf.ts(zzow02,zzow03,zzow04);basic/install-ext.ts(zzow03);extended/keyring.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v8.ts(zzow02,zzow03,zzow04);extended/node-versions/node-v14.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02)
+basic/install.ts(zzow06,zzow07,zzow08);basic/install-ptf.ts(zzow06,zzow07,zzow08);basic/install-ext.ts(zzow07);extended/keyring.ts(zzow06,zzow07,zzow08);extended/node-versions/node-v18.ts(zzow06,zzow07,zzow08);extended/certificates/nonstrict-verify-external-certificate.ts(zzow06)
 ```
 
 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.  
@@ -124,8 +122,6 @@ Selected test running elapsed time:
 | Convenience Pax | 53m |
 | SMPE PTF | 68m |
 | z/OS node v18 | 45m |
-| z/OS node v16 | 45m |
-| z/OS node v14 | 45m |
 | Keyring | 53m |
 | Non-strict Verify External Certificate | 51m |
 | Extensions | 67m

diff --git a/.github/workflows/cicd-test.yml b/.github/workflows/cicd-test.yml
@@ -9,10 +9,10 @@ on:
         default: 'Any zzow servers'
         options: 
           - Any zzow servers
-          - zzow02
-          - zzow03
-          - zzow04
-          - zzow02,zzow03,zzow04
+          - zzow06
+          - zzow07
+          - zzow08
+          - zzow06,zzow07,zzow08
       install-test:
         description: 'Choose Install Test'
         type: choice
@@ -24,8 +24,6 @@ on:
           - SMPE PTF
           - Extensions
           - Keyring
-          - z/OS node v14
-          - z/OS node v16
           - z/OS node v18
           - Non-strict Verify External Certificate
           - Install PTF Twice
@@ -63,8 +61,8 @@ env:
   DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax
 
   # below block can be overwritten, adjusted by DevOps only
-  # ZOS_NODE_VERSION more to choose from: v14.21.3.1, v16.20.1
-  ZOS_NODE_VERSION: v14.21.3.1
+  # ZOS_NODE_VERSION more to choose from: v16.20.1,  v18.16.0
+  ZOS_NODE_VERSION: v16.20.1
   CLIENT_NODE_VERSION: v12.18.3
   INSTALL_TEST_DEBUG_INFORMATION: zowe-install-test:*
   SANITY_TEST_DEBUG_INFORMATION: zowe-sanity-test:*
@@ -75,8 +73,6 @@ env:
   SMPE_PTF_TESTFILE: basic/install-ptf.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
   ZOS_NODE_V18_TESTFILE: extended/node-versions/node-v18.ts
   NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE: extended/certificates/nonstrict-verify-external-certificate.ts
   INSTALL_PTF_TWICE_TESTFILE: extended/install-ptf-two-times.ts
@@ -85,7 +81,7 @@ env:
   CONFIG_MANAGER_TESTFILE: extended/config-manager/enable-config-manager.ts
   GENERAL_API_DOCUMENTATION_TESTFILE: basic/install-api-gen.ts
   ZOWE_NIGHTLY_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all)
-  ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v14.ts(any);extended/node-versions/node-v16.ts(any);extended/node-versions/node-v18.ts(zzow04):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any)
+  ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-ptf.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v18.ts(zzow08):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any);extended/config-manager/enable-config-manager.ts(any)
 
 jobs:
   display-dispatch-event-id:
@@ -293,12 +289,6 @@ jobs:
               case 'Keyring':
                 eta = 53
                 break;
-              case 'z/OS node v14':
-                eta = 45
-                break;
-              case 'z/OS node v16':
-                eta = 45
-                break;
               case 'z/OS node v18':
                 eta = 45
                 break;