Merge branch 'v2.x/staging' into v2.x/staging

zowe · Jun 14, 2024 · bceb5d4 · bceb5d4
2 parents dc8ac72 + a2a12b1
commit bceb5d4
Show file tree

Hide file tree

Showing 222 changed files with 11,776 additions and 1,542 deletions.
diff --git a/.dependency/zwe_doc_generation/md-content.js b/.dependency/zwe_doc_generation/md-content.js
@@ -46,7 +46,7 @@ function generateDocumentationForNode(curNode, assembledParentNode) {
             docContent += createDocContent(assembledDocNode[docType.fileName].content, docType);
             const parentDocContent = createDocContent(assembledDocNode[docType.fileName].parentContent, docType);
             if (parentDocContent) {
-                docContent += SUB_SECTION_HEADER_PREFIX + 'Inherited from parent command' + SEPARATOR + parentDocContent;
+                docContent += SEPARATOR + SUB_SECTION_HEADER_PREFIX + 'Inherited from parent command' + SEPARATOR + parentDocContent;
             }
         }
 

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,22 @@
+version: 2
+
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: weekly
+    groups:
+      all-version-dependencies:
+        applies-to: version-updates
+        patterns:
+          - "*"
+        update-types:
+          - "patch"
+          - "minor"
+      all-security-minorpatch:
+        applies-to: security-updates  
+        patterns:
+          - "*"
+        update-types:
+          - "patch"
+          - "minor"
diff --git a/.github/scripts/cicd_test/make_matrix.sh b/.github/scripts/cicd_test/make_matrix.sh
@@ -12,87 +12,94 @@
 
 case $install_test_choice in
 
-    "Convenience Pax")
-    test_file="$CONVENIENCE_PAX_TESTFILE"
-    ;;
-
-    "SMPE FMID")
-    test_file="$SMPE_FMID_TESTFILE"
-    ;;
-
-    "SMPE PTF")
-    test_file="$SMPE_PTF_TESTFILE"
-    ;;
-
-    "Extensions")
-    test_file="$EXTENSIONS_TESTFILE"
-    ;;
-
-    "Keyring")
-    test_file="$KEYRING_TESTFILE"
-    ;;
-
-    "z/OS node v14")
-    test_file="$ZOS_NODE_V14_TESTFILE"
-    ;;
-
-    "z/OS node v16")
-    test_file="$ZOS_NODE_V16_TESTFILE"
-    ;;
-
-    "Non-strict Verify External Certificate")
-    test_file="$NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE"
-    ;;
-
-    "Install PTF Twice")
-    test_file="$INSTALL_PTF_TWICE_TESTFILE"
-    ;;
-
-    "VSAM Caching Storage Method")
-    test_file="$VSAM_CACHING_STORAGE_METHOD_TESTFILE"
-    ;;
-
-    "Infinispan Caching Storage Method")
-    test_file="$INFINISPAN_CACHING_STORAGE_METHOD_TESTFILE"
-    ;;
-
-    "Generate API Documentation")
-    test_file="$GENERAL_API_DOCUMENTATION_TESTFILE"
-    ;;
-
-    "Config Manager")
-    test_file="$CONFIG_MANAGER_TESTFILE"
-    ;;
-
-    "Zowe Nightly Tests")
-    test_file="$ZOWE_NIGHTLY_TESTS_FULL"
-    dont_parse_test_server=true
-    ;;
-
-    "Zowe Release Tests")
-    test_file="$ZOWE_RELEASE_TESTS_FULL"
-    dont_parse_test_server=true
-    ;;
-
-    *)
-    echo "Something went wrong when parsing install test choice input"
-    exit 1
-    ;;
+"Convenience Pax")
+  test_file="$CONVENIENCE_PAX_TESTFILE"
+  ;;
+
+"SMPE FMID")
+  test_file="$SMPE_FMID_TESTFILE"
+  ;;
+
+"SMPE PTF")
+  test_file="$SMPE_PTF_TESTFILE"
+  ;;
+
+"Extensions")
+  test_file="$EXTENSIONS_TESTFILE"
+  ;;
+
+"Keyring")
+  test_file="$KEYRING_TESTFILE"
+  ;;
+
+"z/OS node v18")
+  test_file="$ZOS_NODE_V18_TESTFILE"
+  test_force_system="zzow08"
+  ;;
+
+"z/OS node v20")
+  test_file="$ZOS_NODE_V20_TESTFILE"
+  ;;
+
+"Non-strict Verify External Certificate")
+  test_file="$NON_STRICT_VERIFY_EXTERNAL_CERTIFICATE_TESTFILE"
+  ;;
+
+"Install PTF Twice")
+  test_file="$INSTALL_PTF_TWICE_TESTFILE"
+  ;;
+
+"VSAM Caching Storage Method")
+  test_file="$VSAM_CACHING_STORAGE_METHOD_TESTFILE"
+  ;;
+
+"Infinispan Caching Storage Method")
+  test_file="$INFINISPAN_CACHING_STORAGE_METHOD_TESTFILE"
+  ;;
+
+"Generate API Documentation")
+  test_file="$GENERAL_API_DOCUMENTATION_TESTFILE"
+  ;;
+
+"Config Manager")
+  test_file="$CONFIG_MANAGER_TESTFILE"
+  ;;
+
+"Zowe Nightly Tests")
+  test_file="$ZOWE_NIGHTLY_TESTS_FULL"
+  dont_parse_test_server=true
+  ;;
+
+"Zowe Release Tests")
+  test_file="$ZOWE_RELEASE_TESTS_FULL"
+  dont_parse_test_server=true
+  ;;
+
+*)
+  echo "Something went wrong when parsing install test choice input"
+  exit 1
+  ;;
 esac
 
-if [[ -z "$dont_parse_test_server" ]]; then
+# this variable may be set for individual tests above. If using nightly/release, see cicd-test.yml workflow
+if [[ ! -z "$test_force_system" ]]; then
+  TEST_FILE_SERVER="$test_file($test_force_system)"
+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
+  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
 
 # this is the final string that can be recognizable by the matrix processing script down below
@@ -102,17 +109,15 @@ echo "TEST_FILE_SERVER is "$TEST_FILE_SERVER
 TEST_FILE_SERVER=$TEST_FILE_SERVER | tr -d "[:space:]"
 
 MATRIX_JSON_STRING="{\"include\":["
-for each_test_file_server in $(echo "$TEST_FILE_SERVER" | sed "s/;/ /g")
-do
-    test_file=$(echo "$each_test_file_server" | cut -d "(" -f1)
-    for test_server in $(echo "$each_test_file_server" | cut -d "(" -f2 | cut -d ")" -f1 | sed "s/,/ /g")
-    do
-        MATRIX_JSON_STRING="$MATRIX_JSON_STRING{\"test\":\"$test_file\",\"server\":\"marist-$test_server\"},"
-    done
+for each_test_file_server in $(echo "$TEST_FILE_SERVER" | sed "s/;/ /g"); do
+  test_file=$(echo "$each_test_file_server" | cut -d "(" -f1)
+  for test_server in $(echo "$each_test_file_server" | cut -d "(" -f2 | cut -d ")" -f1 | sed "s/,/ /g"); do
+    MATRIX_JSON_STRING="$MATRIX_JSON_STRING{\"test\":\"$test_file\",\"server\":\"marist-$test_server\"},"
+  done
 done
 
 # remove trailing comma
 MATRIX_JSON_STRING=$(echo $MATRIX_JSON_STRING | sed 's/,$//g')
 
 MATRIX_JSON_STRING="$MATRIX_JSON_STRING]}"
-echo "::set-output name=matrix::$MATRIX_JSON_STRING"
+echo "matrix=$MATRIX_JSON_STRING" >>$GITHUB_OUTPUT
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/scripts/cicd_test/prep7_more_test_prep/06_process_outputs.sh b/.github/scripts/cicd_test/prep7_more_test_prep/06_process_outputs.sh
@@ -11,13 +11,13 @@
 ################################################################################
 
 # Set outputs
-echo ::set-output name=ZOWE_ARTIFACTORY_FINAL::$ZOWE_ARTIFACTORY_FINAL
-echo ::set-output name=ZOWE_ARTIFACTORY_FINAL_FILENAME::$ZOWE_ARTIFACTORY_FINAL_FILENAME
-echo ::set-output name=NODE_HOME_PATTERN::/ZOWE/node/node-$ZOS_NODE_VERSION-os390-s390x
-echo ::set-output name=TEST_SERVER::$TEST_SERVER
-echo ::set-output name=TEST_SERVER_NICKNAME::$TEST_SERVER_NICKNAME
-echo ::set-output name=EXTENSION_LIST::$EXTENSION_LIST
-echo ::set-output name=ZOWE_CLI_ARTIFACTORY_FINAL::$ZOWE_CLI_ARTIFACTORY_FINAL
+echo ZOWE_ARTIFACTORY_FINAL=$ZOWE_ARTIFACTORY_FINAL >>$GITHUB_OUTPUT
+echo ZOWE_ARTIFACTORY_FINAL_FILENAME=$ZOWE_ARTIFACTORY_FINAL_FILENAME >>$GITHUB_OUTPUT
+echo NODE_HOME_PATTERN=/ZOWE/node/node-$ZOS_NODE_VERSION-os390-s390x >>$GITHUB_OUTPUT
+echo TEST_SERVER=$TEST_SERVER >>$GITHUB_OUTPUT
+echo TEST_SERVER_NICKNAME=$TEST_SERVER_NICKNAME >>$GITHUB_OUTPUT
+echo EXTENSION_LIST=$EXTENSION_LIST >>$GITHUB_OUTPUT
+echo ZOWE_CLI_ARTIFACTORY_FINAL=$ZOWE_CLI_ARTIFACTORY_FINAL >>$GITHUB_OUTPUT
 
 # Echo all processed outputs
 echo
@@ -28,4 +28,4 @@ printf "Zowe CLI artifactory path: ${CYAN}$ZOWE_CLI_ARTIFACTORY_FINAL${NC}\n"
 printf "Zowe extension list: ${CYAN}$EXTENSION_LIST${NC}\n"
 printf "Test server: ${CYAN}$TEST_SERVER${NC}\n"
 printf "Test server nickname: ${CYAN}$TEST_SERVER_NICKNAME${NC}\n"
-printf "Node home pattern on z/OS: ${CYAN}/ZOWE/node/node-$ZOS_NODE_VERSION-os390-s390x${NC}\n"
+printf "Node home pattern on z/OS: ${CYAN}/ZOWE/node/node-$ZOS_NODE_VERSION-os390-s390x${NC}\n"