Merge pull request #4058 from zowe/user/markackert/update-marist-systems

update automation for new zzow systems

.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="zzow08"
+  test_force_system="zzow11"
   ;;
 
 "z/OS node v20")
@@ -87,18 +87,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 + 6)))
+      test_server="zzow"$(printf %02d $(($RANDOM % 3 + 9)))
     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
-      # Generates zzow06, zzow07, zzow08
-      interim_test_file_server=$(echo $interim_test_file_server | sed "s#(any)#(zzow0$(echo $(($RANDOM % 3 + 6))))#")
+      # Generates zzow09, zzow10, zzow11
+      interim_test_file_server=$(echo $interim_test_file_server | sed "s#(any)#(zzow$(printf %02d $(($RANDOM % 3 + 9))))#")
     done
 
-    TEST_FILE_SERVER=$(echo $interim_test_file_server | sed "s#(all)#(zzow06,zzow07,zzow08)#g")
+    TEST_FILE_SERVER=$(echo $interim_test_file_server | sed "s#(all)#(zzow09,zzow10,zzow11)#g")
   fi
 fi
 

.github/scripts/cicd_test/prep7_more_test_prep/03_process_test_server.sh

@@ -14,16 +14,16 @@ TEST_SERVER=$(echo "$MATRIX_SERVER" | cut -d "-" -f2)
 
 case $TEST_SERVER in
 
-"zzow06")
-  TEST_SERVER_NICKNAME=marist-6
+"zzow09")
+  TEST_SERVER_NICKNAME=marist-9
   ;;
 
-"zzow07")
-  TEST_SERVER_NICKNAME=marist-7
+"zzow10")
+  TEST_SERVER_NICKNAME=marist-10
   ;;
 
-"zzow08")
-  TEST_SERVER_NICKNAME=marist-8
+"zzow11")
+  TEST_SERVER_NICKNAME=marist-11
   ;;
 
 *)

.github/workflows/build-packaging.yml

@@ -344,7 +344,7 @@ jobs:
         with:
           lock-repository: ${{ github.repository }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          lock-resource-name: zowe-psi-build-zzow07-lock
+          lock-resource-name: zowe-psi-build-zzow10-lock
           lock-avg-retry-interval: 60
 
       - name: '[PSWI 0] PSWI pre-build check for existing smpe'

.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:
 
-- zzow06 (ACF2)
-- zzow07 (Top Secret/TSS)
-- zzow08 (RACF)
+- zzow09 (ACF2)
+- zzow10 (Top Secret/TSS)
+- zzow11 (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 `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)
+- You can choose from one of `zzow09`, `zzow10`, `zzow11`, `zzow09,zzow10,zzow11` (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(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/node-versions/node-v20.ts(zzow06,zzow07,zzow08);extended/certificates/nonstrict-verify-external-certificate.ts(zzow06)
+basic/install.ts(zzow09,zzow10,zzow11);basic/install-ptf.ts(zzow09,zzow10,zzow11);basic/install-ext.ts(zzow10);extended/keyring.ts(zzow09,zzow10,zzow11);extended/node-versions/node-v18.ts(zzow09,zzow10,zzow11);extended/node-versions/node-v20.ts(zzow09,zzow10,zzow11);extended/certificates/nonstrict-verify-external-certificate.ts(zzow09)
 ```
 
 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

@@ -16,10 +16,10 @@ on:
         default: 'Any zzow servers'
         options: 
           - Any zzow servers
-          - zzow06
-          - zzow07
-          - zzow08
-          - zzow06,zzow07,zzow08
+          - zzow09
+          - zzow10
+          - zzow11
+          - zzow09,zzow10,zzow11
       install-test:
         description: 'Choose Install Test'
         type: choice
@@ -90,7 +90,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-fmid.ts(all)
-  ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-fmid.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)
+  ZOWE_RELEASE_TESTS_FULL: basic/install.ts(all);basic/install-fmid.ts(all);basic/install-ext.ts(any);extended/keyring.ts(all);extended/node-versions/node-v18.ts(zzow11):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:

.github/workflows/pswi-zowe-config-test.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           lock-repository: ${{ github.repository }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          lock-resource-name: zowe-psi-build-zzow07-lock
+          lock-resource-name: zowe-psi-build-zzow10-lock
           lock-avg-retry-interval: 30
 
       - name: 'Test ZWECONF workflow'

playbooks/hosts

@@ -1,7 +1,7 @@
 [marist]
-marist-6
-marist-7
-marist-8
+marist-9
+marist-10
+marist-11
 
 [tvt]
 tvt4188

pswi/PSWI-marist.sh

@@ -1,5 +1,5 @@
 set -x
-export ZOSMF_URL="https://zzow07.zowe.marist.cloud"
+export ZOSMF_URL="https://zzow10.zowe.marist.cloud"
 export ZOSMF_PORT=10443
 export ZOSMF_SYSTEM="S0W1"
 export DIR="/u/zowead2"
@@ -42,7 +42,7 @@ if [ -f ../.pax/zowe-smpe.zip ]; then
   mkdir -p "unzipped"
   unzip ../.pax/zowe-smpe.zip -d unzipped
 else
-  echo "zowe-smpe file not found" >> report.txt
+  echo "zowe-smpe file not found" >>report.txt
   exit -1
 fi
 
@@ -74,7 +74,7 @@ else
   if [ -f ../.pax/${FMID}.zip ]; then
     unzip ../.pax/${FMID}.zip -d unzipped
   else
-    echo "File with FMID not found" >> report.txt
+    echo "File with FMID not found" >>report.txt
     exit -1
   fi
 fi
@@ -134,13 +134,13 @@ if [ $presmpe -eq 0 ]; then
         # Test PSWI
         sh 05_test.sh
         test=$?
-        
+
         if [ $test -eq 0 ]; then
           #test the workflows
           sh 051_test_workflows.sh
           wf_test=$?
         fi
-        
+
         # Cleanup after the test
         sh 06_test_cleanup.sh
       fi
@@ -165,19 +165,19 @@ echo ""
 echo ""
 
 if [ $smpe -ne 0 ] || [ $ptf -ne 0 ] || [ $create -ne 0 ] || [ $test -ne 0 ] || [ $presmpe -ne 0 ] || [ $wf_test -ne 0 ]; then
-  echo "Build unsuccessful!" >> report.txt
+  echo "Build unsuccessful!" >>report.txt
   if [ $presmpe -ne 0 ]; then
-    echo "Pre-SMP/E wasn't successful." >> report.txt
+    echo "Pre-SMP/E wasn't successful." >>report.txt
   elif [ $smpe -ne 0 ]; then
-    echo "SMP/E wasn't successful." >> report.txt
+    echo "SMP/E wasn't successful." >>report.txt
   elif [ $ptf -ne 0 ]; then
-    echo "Applying PTFs wasn't successful." >> report.txt
+    echo "Applying PTFs wasn't successful." >>report.txt
   elif [ $create -ne 0 ]; then
-    echo "Creation of PSWI wasn't successful." >> report.txt
+    echo "Creation of PSWI wasn't successful." >>report.txt
   elif [ $test -ne 0 ]; then
-    echo "Testing of PSWI wasn't successful." >> report.txt
+    echo "Testing of PSWI wasn't successful." >>report.txt
   elif [ $wf_test -ne 0 ]; then
-    echo "Workflow testing wasn't successful." >> report.txt
+    echo "Workflow testing wasn't successful." >>report.txt
   fi
   exit -1
 else

pswi/ZWECONF_test.sh

@@ -1,4 +1,4 @@
-export ZOSMF_URL="https://zzow07.zowe.marist.cloud"
+export ZOSMF_URL="https://zzow10.zowe.marist.cloud"
 export ZOSMF_PORT=10443
 export ZOSMF_SYSTEM="S0W1"
 export JOBNAME="ZWECONF1"

tests/installation/src/__tests__/extended/keyring-modes/acf2-keyring.ts

@@ -18,7 +18,7 @@ import {
   KEYSTORE_MODE_KEYRING,
 } from '../../../constants';
 
-const testServer = 'marist-6';
+const testServer = 'marist-9';
 const testSuiteName = 'Test convenience build installation with keystore pointing to an ACF2 keyring';
 describe(testSuiteName, () => {
   beforeAll(() => {

tests/installation/src/__tests__/extended/keyring-modes/racf-keyring.ts

@@ -18,7 +18,7 @@ import {
   KEYSTORE_MODE_KEYRING,
 } from '../../../constants';
 
-const testServer = 'marist-8';
+const testServer = 'marist-11';
 const testSuiteName = 'Test convenience build installation with keystore pointing to a RACF keyring';
 describe(testSuiteName, () => {
   beforeAll(() => {

tests/installation/src/__tests__/extended/keyring-modes/tss-keyring.ts

@@ -18,7 +18,7 @@ import {
   KEYSTORE_MODE_KEYRING,
 } from '../../../constants';
 
-const testServer = 'marist-7';
+const testServer = 'marist-10';
 const testSuiteName = 'Test convenience build installation with keystore pointing to a TSS keyring';
 describe(testSuiteName, () => {
   beforeAll(() => {

tests/installation/src/__tests__/extended/node-versions/node-v18.ts

@@ -15,7 +15,7 @@ import {
 } from '../../../utils';
 import { TEST_TIMEOUT_CONVENIENCE_BUILD } from '../../../constants';
 
-// Only runs on zzow08 at time of change (04.2023). See cicd-test.yml and make_matrix.sh.
+// Only runs on zzow11 at time of change (04.2023). See cicd-test.yml and make_matrix.sh.
 const testServer = process.env.TEST_SERVER;
 const testSuiteName = 'Test convenience build installation with node.js v18';
 describe(testSuiteName, () => {

tests/installation/src/__tests__/extended/security-systems/convenience/acf2.ts

@@ -18,10 +18,10 @@ import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants';
 /**
  * Define this test should run in a specific worker
  *
- * @worker marist-6
+ * @worker marist-9
  */
-// hard code to use marist-6 which we started with ACF2
-const testServer = 'marist-6';
+// hard code to use marist-9 which we started with ACF2
+const testServer = 'marist-9';
 const testSuiteName = 'Test convenience build installation with ACF2';
 describe(testSuiteName, () => {
   beforeAll(() => {

tests/installation/src/__tests__/extended/security-systems/convenience/racf.ts

@@ -18,9 +18,9 @@ import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants';
 /**
  * Define this test should run in a specific worker
  *
- * @worker marist-8
+ * @worker marist-11
  */
-const testServer = 'marist-8';
+const testServer = 'marist-11';
 const testSuiteName = 'Test convenience build installation with RACF';
 describe(testSuiteName, () => {
   beforeAll(() => {

tests/installation/src/__tests__/extended/security-systems/convenience/ts.ts

@@ -18,10 +18,10 @@ import {TEST_TIMEOUT_CONVENIENCE_BUILD} from '../../../../constants';
 /**
  * Define this test should run in a specific worker
  *
- * @worker marist-7
+ * @worker marist-10
  */
-// hard code to use marist-7 which we started with Top Secret
-const testServer = 'marist-7';
+// hard code to use marist-10 which we started with Top Secret
+const testServer = 'marist-10';
 const testSuiteName = 'Test convenience build installation with Top Secret';
 describe(testSuiteName, () => {
   beforeAll(() => {

tests/installation/src/__tests__/extended/security-systems/fmid/acf2.ts

@@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_FMID} from '../../../../constants';
 /**
  * Define this test should run in a specific worker
  *
- * @worker marist-6
+ * @worker marist-9
  */
-// hard code to use marist-6 which we started with ACF2
-const testServer = 'marist-6';
+// hard code to use marist-9 which we started with ACF2
+const testServer = 'marist-9';
 const testSuiteName = 'Test SMPE FMID installation with ACF2';
 describe(testSuiteName, () => {
   beforeAll(() => {

tests/installation/src/__tests__/extended/security-systems/fmid/racf.ts

@@ -18,9 +18,9 @@ import {TEST_TIMEOUT_SMPE_FMID} from '../../../../constants';
 /**
  * Define this test should run in a specific worker
  *
- * @worker marist-8
+ * @worker marist-11
  */
-const testServer = 'marist-8';
+const testServer = 'marist-11';
 const testSuiteName = 'Test SMPE FMID installation with RACF';
 describe(testSuiteName, () => {
   beforeAll(() => {

tests/installation/src/__tests__/extended/security-systems/fmid/ts.ts

@@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_FMID} from '../../../../constants';
 /**
  * Define this test should run in a specific worker
  *
- * @worker marist-7
+ * @worker marist-10
  */
-// hard code to use marist-7 which we started with Top Secret
-const testServer = 'marist-7';
+// hard code to use marist-10 which we started with Top Secret
+const testServer = 'marist-10';
 const testSuiteName = 'Test SMPE FMID installation with Top Secret';
 describe(testSuiteName, () => {
   beforeAll(() => {

tests/installation/src/__tests__/extended/security-systems/ptf/acf2.ts

@@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_PTF} from '../../../../constants';
 /**
  * Define this test should run in a specific worker
  *
- * @worker marist-6
+ * @worker marist-9
  */
-// hard code to use marist-6 which we started with ACF2
-const testServer = 'marist-6';
+// hard code to use marist-9 which we started with ACF2
+const testServer = 'marist-9';
 const testSuiteName = 'Test SMPE PTF installation with ACF2';
 describe(testSuiteName, () => {
   beforeAll(() => {

tests/installation/src/__tests__/extended/security-systems/ptf/racf.ts

@@ -18,9 +18,9 @@ import {TEST_TIMEOUT_SMPE_PTF} from '../../../../constants';
 /**
  * Define this test should run in a specific worker
  *
- * @worker marist-8
+ * @worker marist-11
  */
-const testServer = 'marist-8';
+const testServer = 'marist-11';
 const testSuiteName = 'Test SMPE PTF installation with RACF';
 describe(testSuiteName, () => {
   beforeAll(() => {

tests/installation/src/__tests__/extended/security-systems/ptf/ts.ts

@@ -18,10 +18,10 @@ import {TEST_TIMEOUT_SMPE_PTF} from '../../../../constants';
 /**
  * Define this test should run in a specific worker
  *
- * @worker marist-7
+ * @worker marist-10
  */
-// hard code to use marist-7 which we started with Top Secret
-const testServer = 'marist-7';
+// hard code to use marist-10 which we started with Top Secret
+const testServer = 'marist-10';
 const testSuiteName = 'Test SMPE PTF installation with Top Secret';
 describe(testSuiteName, () => {
   beforeAll(() => {