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]>
zowe · Nov 22, 2023 · 4bd0bf8 · 4bd0bf8
1 parent 1a25ee1
commit 4bd0bf8
Show file tree

Hide file tree

Showing 29 changed files with 154 additions and 146 deletions.
diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh
@@ -34,7 +34,7 @@ case $install_test_choice in
 
 "z/OS node v18")
   test_file="$ZOS_NODE_V18_TESTFILE"
-  test_force_system="zzow04"
+  test_force_system="zzow08"
   ;;
 
 "Non-strict Verify External Certificate")
@@ -90,10 +90,11 @@ 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
@@ -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
@@ -109,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-v18.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.  

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
@@ -81,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-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:

diff --git a/playbooks/host_vars/marist-2.yml → playbooks/host_vars/marist-6.yml b/playbooks/host_vars/marist-2.yml → playbooks/host_vars/marist-6.yml
@@ -1,5 +1,5 @@
 ---
 zos_security_system: ACF2
 zos_zosmf_ca: ZOSMFSRV
-
+ansible_port: 65522
 zowe_configure_ignore_security_failures: true
diff --git a/playbooks/host_vars/marist-3.yml → playbooks/host_vars/marist-7.yml b/playbooks/host_vars/marist-3.yml → playbooks/host_vars/marist-7.yml
@@ -4,5 +4,5 @@ zowe_sanity_test_testcases: "./test/**/!(api-doc-gen).js"
 zowe_apiml_security_x509_enabled: true
 zowe_apiml_security_oidc_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
diff --git a/playbooks/host_vars/marist-4.yml → playbooks/host_vars/marist-8.yml b/playbooks/host_vars/marist-4.yml → playbooks/host_vars/marist-8.yml
@@ -13,4 +13,6 @@ 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
diff --git a/playbooks/hosts b/playbooks/hosts
@@ -1,7 +1,7 @@
 [marist]
-marist-2
-marist-3
-marist-4
+marist-6
+marist-7
+marist-8
 
 [tvt]
 tvt4188

diff --git a/pswi/00_presmpe.sh b/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

diff --git a/pswi/01_smpe.sh b/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 SMPE20
 EOF

diff --git a/pswi/02_ptf.sh b/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
@@ -37,7 +38,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

diff --git a/pswi/03_create.sh b/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

diff --git a/pswi/05_test.sh b/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