Merge pull request #3676 from zowe/user/markackert/zzow-updates-v1x

v1.x: zzow system updates (#3651)

.github/scripts/cicd_test/make_matrix.sh

@@ -66,7 +66,7 @@ case $install_test_choice in
   ;;
 
 "Zowe Release Tests")
-  test_file="$ZOWE_RELEAE_TESTS_FULL"
+  test_file="$ZOWE_RELEASE_TESTS_FULL"
   dont_parse_test_server=true
   ;;
 
@@ -78,17 +78,18 @@ esac
 
 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))))#")
+    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
 
 # this is the final string that can be recognizable by the matrix processing script down below

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

.github/workflows/build-packaging.yml

@@ -264,7 +264,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'
@@ -277,6 +277,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: '[TP_DOCKER] Copy zowe.pax to prepare for building Docker images'

.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
@@ -120,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-v16.ts(zzow02,zzow03,zzow04);extended/certificates/nonstrict-verify-external-certificate.ts(zzow02);extended/caching-storages/infinispan-storage.ts
+basic/install.ts(zzow06,zzow07,zzow08);basic/install-ptf.ts(zzow06,zzow07,zzow08);basic/install-docker.ts(zzow08);basic/install-ext.ts(zzow07);extended/keyring.ts(zzow06,zzow07,zzow08);extended/node-versions/node-v16.ts(zzow06,zzow07,zzow08);extended/certificates/nonstrict-verify-external-certificate.ts(zzow06);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.  

.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
@@ -60,8 +60,8 @@ env:
   DEFAULT_ZOWE_EXT_ARTIFACTORY_PATTERN: libs-snapshot-local/org/zowe/{ext-name}/*/{ext-name}-*.pax
 
   # can be overwritten, adjusted by DevOps only
-  ZOS_NODE_VERSION: v14.21.3
-  # ZOS_NODE_VERSION more to choose from: v14.21.3, v16.19.1
+  ZOS_NODE_VERSION: v16.20.2
+  # ZOS_NODE_VERSION more to choose from: v16.20.2
   CLIENT_NODE_VERSION: v12.18.3
   INSTALL_TEST_DEBUG_INFORMATION: zowe-install-test:*
   SANITY_TEST_DEBUG_INFORMATION: zowe-sanity-test:*
@@ -79,8 +79,8 @@ env:
   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(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)
+  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-v16.ts(any):extended/certificates/nonstrict-verify-external-certificate.ts(any);extended/caching-storages/infinispan-storage.ts(any)
 
 jobs:
   display-dispatch-event-id:

.pax/pre-packaging.sh

@@ -27,7 +27,7 @@ set -x
 # ./content/zowe-${ZOWE_VERSION}/
 
 # use node v14 to build
-export NODE_HOME=/ZOWE/node/node-v14.21.3-os390-s390x
+export NODE_HOME=/ZOWE/node/node-v16.20.2-os390-s390x
 
 # ---------------------------------------------------------------------
 # --- create JCL files

bin/apiml_cm.sh

@@ -20,7 +20,6 @@
 # IBM Java keytool documentation:
 # https://www.ibm.com/support/knowledgecenter/en/SSYKE2_8.0.0/com.ibm.java.security.component.80.doc/security-component/keytoolDocs/keytool_overview.html
 #
-
 BASE_DIR=$(dirname "$0")
 PARAMS="$@"
 PWD=`pwd`

bin/zowe-init.sh

@@ -21,7 +21,6 @@
 
 # This script checks to see whether they are set, and if not tries to locate them, 
 # and if they can't be found prompt for them before setting them
-
 echo "<zowe-init.sh>" >> $LOG_FILE
 
 # process input parameters.
@@ -167,7 +166,7 @@ then
     rc=$?
     if [[ -n "$hn" && $rc -eq 0 ]]
     then
-          ZOWE_IP_ADDRESS=`$ping_bin -A ipv4 $hn|sed -n 's/.* (\(.*\)).*/\1/p'`
+          ZOWE_IP_ADDRESS=`$ping_bin -A ipv4 $hn|sed -n '1 s/.* (\(.*\)).*/\1/p'`
           if [[ ! -n "$ZOWE_IP_ADDRESS" ]]
           then
                echo Error: $ping_bin $hn command failed to find IP

bin/zowe-setup-certificates.sh

@@ -33,7 +33,6 @@
 # - COMPONENT_LEVEL_CERTIFICATES - optional - if you want to generate dedicated certificates for certain components.
 # - EXTERNAL_COMPONENT_CERTIFICATES - optional - external certificates for each of components listed in COMPONENT_LEVEL_CERTIFICATES
 # - EXTERNAL_COMPONENT_CERTIFICATE_ALIASES - optional - external certificate aliases for each of components listed in COMPONENT_LEVEL_CERTIFICATES
-
 function detectExternalCAs {
   echo "Detecting external CAs ... STARTED"
   EXTERNAL_ROOT_CA=

playbooks/ansible.cfg

@@ -1,10 +1,10 @@
 [defaults]
 
 # some basic default values...
-inventory      = hosts
+inventory = hosts
 # library        = /root/ansible/library:/usr/share/my_modules/
 #module_utils   = /usr/share/my_module_utils/
-remote_tmp     = /tmp
+remote_tmp = /tmp
 #local_tmp      = ~/.ansible/tmp
 #plugin_filters_cfg = /etc/ansible/plugin_filters.yml
 #forks          = 5
@@ -129,7 +129,7 @@ transfer_method = smart
 # how long the persistent connection will remain idle before it is destroyed.
 # If the connection doesn't receive a request before the timeout value
 # expires, the connection is shutdown. The default value is 30 seconds.
-#connect_timeout = 30
+#connect_timeout = 90
 
 # Configures the persistent connection retry timeout.  This value configures the
 # the retry timeout that ansible-connection will wait to connect
@@ -183,7 +183,6 @@ transfer_method = smart
 #diff_remove = red
 #diff_lines = cyan
 
-
 [diff]
 # Always print diff when running ( same as always running with -D/--diff )
 # always = no

playbooks/host_vars/marist-6.yml

@@ -0,0 +1,5 @@
+---
+zos_security_system: ACF2
+zos_zosmf_ca: ZOSMFSRV
+ansible_port: 65522
+zowe_configure_ignore_security_failures: true

playbooks/host_vars/marist-3.yml → playbooks/host_vars/marist-7.yml

@@ -3,3 +3,5 @@ zos_security_system: TSS
 zowe_sanity_test_testcases: "./test/**/!(api-doc-gen).js"
 zowe_apiml_security_x509_enabled: true
 zos_zosmf_ca: ZOSMFCA
+ansible_port: 65522
+zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4

playbooks/host_vars/marist-4.yml → playbooks/host_vars/marist-8.yml

@@ -12,3 +12,7 @@ zowe_install_logs_dir: /ZOWE/logs
 
 zowe_smpe_volser: ZOWE03
 zowe_caching_vsam_volume: ZOWE03
+
+ansible_port: 65522
+
+zowe_configure_ignore_security_failures: true # Required for keyring tests - only Root cert passed, missing intermediate RC=4

playbooks/hosts

@@ -4,9 +4,9 @@ river-1
 river-3
 
 [marist]
-marist-2
-marist-3
-marist-4
+marist-6
+marist-7
+marist-8
 
 [zdnt:children]
 river

pswi/00_presmpe.sh

@@ -8,6 +8,7 @@ echo ""
 echo "Script for preparing datasets for SMP/E (PTFs)..."
 echo "Host               :" $ZOSMF_URL
 echo "Port               :" $ZOSMF_PORT
+echo "SSH Port           :" $ZZOW_SSH_PORT
 echo "z/OSMF system      :" $ZOSMF_SYSTEM
 echo "FMID               :" $FMID
 echo "RFDSNPFX           :" $RFDSNPFX
@@ -27,7 +28,7 @@ sh scripts/tmp_mounts.sh "${TMP_ZFS}" "${TMP_MOUNT}"
 if [ $? -gt 0 ];then exit -1;fi 
 
 cd unzipped
-sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF
+sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF
 cd ${TMP_MOUNT}
 put ${FMID}.pax.Z
 EOF
@@ -76,13 +77,13 @@ rm JCL
 cd unzipped
 if [ $PTFNR -eq 2 ]
 then
-sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF
+sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF
 cd ${TMP_MOUNT}
 put ${RFDSNPFX}.${FMID}.${PTF1} ${PTF1}
 put ${RFDSNPFX}.${FMID}.${PTF2} ${PTF2}
 EOF
 else
-sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF
+sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF
 cd ${TMP_MOUNT}
 put ${RFDSNPFX}.${FMID}.${PTF1} ${PTF1}
 EOF

pswi/01_smpe.sh

@@ -9,6 +9,7 @@ echo ""
 echo "Script for creation of ZOWE SMP/E environment..."
 echo "Host                        :" $ZOSMF_URL
 echo "Port                        :" $ZOSMF_PORT
+echo "SSH Port                    :" $ZZOW_SSH_PORT
 echo "z/OSMF system               :" $ZOSMF_SYSTEM
 echo "Dataset with workflows      :" $WORKFLOW_DS
 echo "SMPE workflow name          :" $SMPE_WF_NAME
@@ -42,7 +43,7 @@ echo "Uploading workflow SMPE into ${DIR} directory thru SSH"
 
 cd workflows
 
-sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF
+sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF
 cd ${DIR}
 put SMPE19
 EOF

pswi/02_ptf.sh

@@ -9,6 +9,7 @@ echo ""
 echo "Script for applying of PTFs into SMPE via workflow..."
 echo "Host                        :" $ZOSMF_URL
 echo "Port                        :" $ZOSMF_PORT
+echo "SSH Port                    :" $ZZOW_SSH_PORT
 echo "z/OSMF system               :" $ZOSMF_SYSTEM
 echo "CSI HLQ                     :" $CSIHLQ
 echo "PTF dataset                 :" $SMPE
@@ -38,7 +39,7 @@ ADD_WORKFLOW_JSON='{"workflowName":"'$PTF_WF_NAME'",
 
 cd workflows
 
-sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF
+sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF
 cd ${DIR}
 put WFPTF
 EOF

pswi/03_create.sh

@@ -8,6 +8,7 @@ echo ""
 echo "Script for creating a Portable Software Instance..."
 echo "Host               :" $ZOSMF_URL
 echo "Port               :" $ZOSMF_PORT
+echo "SSH Port           :" $ZZOW_SSH_PORT
 echo "CSI HLQ            :" $CSIHLQ
 echo "SMP/E zone         :" $ZONE
 echo "z/OSMF system      :" $ZOSMF_SYSTEM
@@ -331,7 +332,7 @@ if [ $? -gt 0 ];then exit -1;fi
 rm JCL
 
 cd ../.pax
-sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF
+sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF
 cd ${TMP_MOUNT}
 get ${SWI_NAME}.pax.Z
 EOF

pswi/05_test.sh

@@ -8,6 +8,7 @@ echo ""
 echo "Script for testing a Portable Software Instance..."
 echo "Host                   :" $ZOSMF_URL
 echo "Port                   :" $ZOSMF_PORT
+echo "SSH Port               :" $ZZOW_SSH_PORT
 echo "PSWI name              :" $PSWI
 echo "z/OSMF system          :" $ZOSMF_SYSTEM
 echo "Test HLQ               :" $TEST_HLQ
@@ -33,7 +34,7 @@ sh scripts/tmp_mounts.sh "${TMP_ZFS}" "${TMP_MOUNT}"
 if [ $? -gt 0 ];then exit -1;fi 
 
 cd ../.pax
-sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P 22 ${ZOSMF_USER}@${HOST} << EOF
+sshpass -p${ZOSMF_PASS} sftp -o HostKeyAlgorithms=+ssh-rsa -o BatchMode=no -o StrictHostKeyChecking=no -o PubkeyAuthentication=no -b - -P ${ZZOW_SSH_PORT} ${ZOSMF_USER}@${HOST} << EOF
 cd ${TMP_MOUNT}
 put ${SWI_NAME}.pax.Z
 EOF