Merge branch 'v3.x/staging' into user/zlatnikp/changepfxtarget

example-zowe.yaml

@@ -457,17 +457,17 @@ java:
 
 
 #-------------------------------------------------------------------------------
-# node.js configuration
+# Node.js configuration
 #
-# Some Zowe components requires node.js. Define the path where you have your
-# node.js is installed.
+# Some Zowe components requires Node.js. Define the path where you have your
+# Node.js is installed.
 #
 # **NOTE**: this field can be updated automatically if you pass `--update-config`
 # to `zwe init` command.
 #-------------------------------------------------------------------------------
 node:
   # **COMMONLY_CUSTOMIZED**
-  # Path to your node.js home directory
+  # Path to your Node.js home directory
   home: ""
 
 
@@ -623,7 +623,7 @@ components:
 #     # for this HA instance, we did not customize "components", so it will use default value.
 
 #   # HA instance ID, we will start 2 instances on LPAR2
-#   # **NOTE**, we can only start one gateway in same LPAR.
+#   # **NOTE**, we can only start one Gateway in same LPAR.
 #   lpar2a:
 #     # hostname where this instance will be started
 #     hostname: lpar2.my-company.com

pswi/03_create.sh

@@ -151,6 +151,13 @@ echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWECONF;" >>JCL
 echo "sed 's|UTF-8|IBM-1047|g' _ZWECONF > ZWECONF;" >>JCL
 echo "cp -T ZWECONF \$target;" >>JCL
 echo "/*" >>JCL
+echo "//CHMODZWE EXEC PGM=BPXBATCH" >>JCL
+echo "//STDOUT DD SYSOUT=*" >>JCL
+echo "//STDERR DD SYSOUT=*" >>JCL
+echo "//STDPARM  DD *" >>JCL
+echo "SH set -x;set -e;" >>JCL
+echo "chmod -R 777 ${ZOWE_MOUNT};" >>JCL
+echo "/*" >>JCL
 
 sh scripts/submit_jcl.sh "$(cat JCL)"
 if [ $? -gt 0 ]; then exit -1; fi

pswi/04_create_cleanup.sh

@@ -100,29 +100,28 @@ sh scripts/submit_jcl.sh "$(cat JCL)"
 # Not checking results so the script doesn't fail
 rm JCL
 
-if [ "$ZOSMF_V" = "2.3" ]; then
-  # Unmount and delete
-  echo "Unmounting and deleting zFS ${WORK_ZFS}."
-
-  echo ${JOBST1} >JCL
-  echo ${JOBST2} >>JCL
-  echo "//UNMNTZFS EXEC PGM=IKJEFT01,REGION=4096K,DYNAMNBR=50" >>JCL
-  echo "//SYSTSPRT DD SYSOUT=*" >>JCL
-  echo "//SYSTSOUT DD SYSOUT=*" >>JCL
-  echo "//SYSTSIN DD * " >>JCL
-  echo "UNMOUNT FILESYSTEM('${WORK_ZFS}') +  " >>JCL
-  echo "IMMEDIATE" >>JCL
-  echo "/*" >>JCL
-  echo "//DELTZFST EXEC PGM=IDCAMS" >>JCL
-  echo "//SYSPRINT DD SYSOUT=*" >>JCL
-  echo "//SYSIN    DD *" >>JCL
-  echo " DELETE ${WORK_ZFS}" >>JCL
-  echo "/*" >>JCL
-
-  sh scripts/submit_jcl.sh "$(cat JCL)"
-  # Not checking results so the script doesn't fail
-  rm JCL
-fi
+
+# Unmount and delete
+echo "Unmounting and deleting zFS ${WORK_ZFS}."
+
+echo ${JOBST1} >JCL
+echo ${JOBST2} >>JCL
+echo "//UNMNTZFS EXEC PGM=IKJEFT01,REGION=4096K,DYNAMNBR=50" >>JCL
+echo "//SYSTSPRT DD SYSOUT=*" >>JCL
+echo "//SYSTSOUT DD SYSOUT=*" >>JCL
+echo "//SYSTSIN DD * " >>JCL
+echo "UNMOUNT FILESYSTEM('${WORK_ZFS}') +  " >>JCL
+echo "IMMEDIATE" >>JCL
+echo "/*" >>JCL
+echo "//DELTZFST EXEC PGM=IDCAMS" >>JCL
+echo "//SYSPRINT DD SYSOUT=*" >>JCL
+echo "//SYSIN    DD *" >>JCL
+echo " DELETE ${WORK_ZFS}" >>JCL
+echo "/*" >>JCL
+
+sh scripts/submit_jcl.sh "$(cat JCL)"
+# Not checking results so the script doesn't fail
+rm JCL
 
 echo "Invoking REST API to unmount Zowe zFS ${ZOWE_ZFS} from its mountpoint."
 

workflows/files/ZWECONF.properties

@@ -140,10 +140,10 @@ zowe_job_prefix=ZWE1
 
 # zowe_externalDomains
 # Label: Zowe external domains
-# Abstract: The domain name of your Dynamic VIP Address (DVIPA)
+# Abstract: The list of external domains
 # Category: zowe
 # Description:
-#  The domain name of your Dynamic VIP Address (DVIPA)
+#  Defines a list of external domains that will be used by the Zowe instance.
 zowe_externalDomains=sample-domain.com
 
 # zowe_externalPort