Merge branch 'master' into master

Author: cxharris

Jenkinsfile

@@ -218,7 +218,7 @@ pipeline {
                     //sh("npm set @zowe:registry https://api.bintray.com/npm/ca/brightside/")
                     sh("npm set @zowe:registry https://registry.npmjs.org")
 
-                    sh("npm install -g @zowe/cli@latest")
+                    sh("npm install -g @zowe/cli@daily")
                     sh("zowe --version")
                 }
             }
@@ -536,6 +536,9 @@ pipeline {
                     expression {
                         return BRANCH_NAME == MASTER_BRANCH
                     }
+                    expression {
+                        return GIT_COMMIT =! GIT_PREVIOUS_SUCCESSFUL_COMMIT
+                    }
                 }
             }
             steps {
@@ -587,6 +590,9 @@ pipeline {
                     expression {
                        return BRANCH_NAME == MASTER_BRANCH
                     }
+                    expression {
+                        return GIT_COMMIT =! GIT_PREVIOUS_SUCCESSFUL_COMMIT
+                    }
                 }
             }
             steps {

docs/pages/cdp/cdp-Deploying-using-individual-actions.md

@@ -13,14 +13,14 @@ The `zowe cics-deploy push bundle` command performs a set of actions to deploy a
 
 * undeploy the old version of the CICS bundle in CICS
 * upload the new version of the CICS bundle to z/OS
-* run `npm install` on z/OS to resolve Node.js application dependencies
-* deploy the CICS bundle in CICS.
+* resolve Node.js application dependencies on z/OS
+* deploy the CICS bundle in CICS
 
 However, there may be situations where you need more control of these actions or perform alternate actions. The following sections describe how each of these actions can be performed independently, enabling you to form a sequence of commands to achieve your needs.
 
 ### Undeploy a CICS bundle
 
-Undeploying a CICS bundle disables the CICS bundle resource (BUNDLE) in CICS. Disabling the CICS bundle causes the resources defined in it to also be disabled. For Node.js applications, CICS sends a SIGTERM signal that can be handled in the application to stop in a controlled manner, such as stopping new requests and completing existing requests. Once the CICS bundle has been disabled it is then discarded in CICS.
+Undeploying a CICS bundle disables the CICS bundle resource (BUNDLE) in CICS. Disabling the BUNDLE causes the resources defined in it to also be disabled. For Node.js applications, CICS sends a SIGTERM signal that can be handled in the application to stop in a controlled manner, such as stopping new requests and completing existing requests. Once the CICS bundle has been disabled it is then discarded in CICS.
 
 ```console
 zowe cics-deploy undeploy bundle --name Express
@@ -38,17 +38,17 @@ zowe cics-deploy undeploy bundle --name Express --target-state disabled
 
 Before uploading the CICS bundle to z/OS, you need to ensure the target directory is empty in order to prevent merging with a previously deployed version of the CICS bundle.
 
-There are several ways to run shell commands and scripts on z/OS, such as SSH, batch jobs, and Zowe. When using Zowe, an SSH connection is established using information in the Zowe ssh profile, and then the shell .profile for the user will be run to setup the environment. The command is then run in the directory specified by the `--cwd` option. The return code from the Zowe CLI will be the same as that returned by the command run on z/OS, enabling you to take action in your script in error scenarios.
+There are several ways to run shell commands and scripts on z/OS, such as SSH, batch jobs, and Zowe. When using Zowe, an SSH connection is established using information in the Zowe ssh profile, and the shell .profile for the user is run to setup the environment. The command is then run in z/OS in the directory specified by the `--cwd` option. The return code from the command is used to set the Zowe CLI return code, enabling you to take action in your script in error scenarios.
 
 For example, to remove the target directory:
 
 ```console
-zowe zos-uss issue ssh "rm -Rv *" --cwd "/var/cicsts/bundles/myexpressapp_1.0.0" && echo RC=$?
+zowe zos-uss issue ssh "rm -Rv *" --cwd "/var/cicsts/bundles/myexpressapp_1.0.0" || echo "RC=$?"
 ```
 
 {% include tip.html content="You can run several commands in one request using the syntax described in [sh — Invoke a shell](https://www.ibm.com/support/knowledgecenter/en/SSLTBW_2.3.0/com.ibm.zos.v2r3.bpxa500/sh.htm)." %}
 
-Typically you will need to upload some files as binary, some as text, and exclude others that are not required to run the application. In addition, it is best practice to tag files on z/OS as binary or with their text codepage to allow for correct codepage translation by editors and environments such as Node.js. You can specify these requirements in a `.zosattributes` file and use the Zowe CLI to upload and tag files in a single command.
+When uploading the CICS bundle to z/OS, you may need to upload some files as binary, some as text, and exclude others that are not required to run the application. In addition, it is best practice to tag files on z/OS as binary or with their text codepage to allow for correct codepage translation by editors and environments such as Node.js and Java. You can specify these requirements in a `.zosattributes` file and use the Zowe CLI to upload and tag files in a single command.
 
 For example, create file **~/myExpressApp/.zosattributes** in the CICS bundle:
 
@@ -76,10 +76,10 @@ node_modules -
 Then upload the CICS bundle to z/OS:
 
 ```console
-zowe zos-files upload dir-to-uss ~/myExpressApp/ /var/cicsts/bundles/myexpressapp_1.0.0 --recursive --attributes ~/myExpressApp/.zosattributes
+zowe zos-files upload dir-to-uss ~/myExpressApp/ "/var/cicsts/bundles/myexpressapp_1.0.0" --recursive --attributes ~/myExpressApp/.zosattributes
 ```
 
-### Run npm on z/OS
+### Resolve Node.js application dependencies on z/OS
 
 A Node.js application typically depends on packages that are described in `package.json`. The dependencies can be installed by running `npm install` in the z/OS directory containing `package.json`, for example:
 
@@ -92,11 +92,11 @@ zowe zos-uss issue ssh "npm install" --cwd "/var/cicsts/bundles/myexpressapp_1.0
 Deploying a CICS bundle defines a CICS bundle resource (BUNDLE), then installs it, and finally enables it. When the CICS bundle is enabled, the Node.js application is started. For example:
 
 ```console
-zowe cics-deploy deploy bundle --name Express --bundle-directory /var/cicsts/bundles/myexpressapp_1.0.0
+zowe cics-deploy deploy bundle --name Express --bundle-directory "/var/cicsts/bundles/myexpressapp_1.0.0"
 ```
 
 Alternatively, to define and install the BUNDLE but not enable it:
 
 ```console
-zowe cics-deploy deploy bundle --name Express --bundle-directory /var/cicsts/bundles/myexpressapp_1.0.0 --target-state disabled
+zowe cics-deploy deploy bundle --name Express --bundle-directory "/var/cicsts/bundles/myexpressapp_1.0.0" --target-state disabled
 ```

docs/pages/cdp/cdp-Deploying-your-first-nodejs-app.md

@@ -29,7 +29,7 @@ CICS TS V5.5 introduced support to run Node.js applications and is required by t
    npm start
    ```
 
-   The Node.js application will start. You can call the application from a browser using URL [http://localhost:3000/](http://localhost:3000/), and press CTRL+C to stop it.
+   The Node.js application will start. You can call the application from a browser using URL [http://localhost:3000/](http://localhost:3000/). To stop the application in the console press CTRL+C.
 
 4. Package the Node.js application into a [CICS bundle](cdp-cics-bundles).
 
@@ -41,7 +41,7 @@ CICS TS V5.5 introduced support to run Node.js applications and is required by t
     zowe cics-deploy generate bundle --port 3000 --overwrite
    ```
 
-    The output will show the directories and files created to form a CICS bundle. For example:
+    The output will indicates the directories and files created to form a CICS bundle. For example:
 
     <pre class="messageText">
     define : NODEJSAPP "myexpressapp" with startscript "./bin/www"
@@ -61,7 +61,7 @@ CICS TS V5.5 introduced support to run Node.js applications and is required by t
 
     A progress bar is shown with status messages as the CICS bundle is deployed and the application is started. This can take a few minutes. If there are errors, retry with the `--verbose` option for more detailed output, or refer to [Troubleshooting](cdp-Troubleshooting-General).
 
-    This results in a CICS BUNDLE resource named `Express` to be created, installed and enabled in CICS. If the BUNDLE `Express` was already defined or installed in CICS, it is undeployed first. As the BUNDLE is enabled, the Node.js application is started.
+    This results in a CICS BUNDLE resource named `Express` being defined, installed and enabled in CICS. If the BUNDLE `Express` was already defined or installed in CICS, it is undeployed first. As the BUNDLE is enabled, the Node.js application is started.
 
 6. Test the Node.js application.
 
@@ -73,4 +73,4 @@ CICS TS V5.5 introduced support to run Node.js applications and is required by t
 
 The Node.js application is packaged into a CICS bundle on the workstation, uploaded to a directory on z/OS, and is running in CICS.
 
-{% include tip.html content="[Best practice for developing Node.js applications](https://www.ibm.com/support/knowledgecenter/SSGMCP_5.5.0/applications/developing/node/best-practice.html) provides guidance on setting and using environment variables and graceful application termination." %}
+{% include tip.html content="When writing your own application, follow the guidance in [Best practice for developing Node.js applications](https://www.ibm.com/support/knowledgecenter/SSGMCP_5.5.0/applications/developing/node/best-practice.html) to use environment variables and enable the application to terminate gracefully." %}

docs/pages/cdp/cdp-Provision-a-CICS-region-using-zospt.md

@@ -9,18 +9,18 @@ folder: cdp
 toc: true
 ---
 
-The [z/OS Provisioning Toolkit](https://developer.ibm.com/mainframe/products/zospt/) (z/OS PT) provides a command line utility to provision CICS regions and other development environment on z/OS. This tutorial requires z/OS PT version 1.1.5 or above to be installed.
+The [z/OS Provisioning Toolkit](https://developer.ibm.com/mainframe/products/zospt/) (z/OS PT) provides a command line utility and z/OSMF workflows to provision CICS regions and other development environments on z/OS. This tutorial requires z/OS PT version 1.1.5 or above to be installed.
 
 ### Prepare a z/OS PT image
 
-A z/OS PT image contains the configuration and files necessary to provision the CICS region. This is typically prepared by the CICS system administrator for use by many developers. The [configuration properties](https://www.ibm.com/support/knowledgecenter/en/SSXH44E_1.0.0/zospt/cics/zospt-cics-properties.html) for the CICS image should include:
+A z/OS PT image contains the configuration and files necessary to provision a CICS region. This is typically prepared by the CICS system administrator. The CICS image should include the following properties. Other properties are available to customise the CICS region to your requirements - see [Configuration properties for CICS images](https://www.ibm.com/support/knowledgecenter/en/SSXH44E_1.0.0/zospt/cics/zospt-cics-properties.html).
 
 | zosptfile entry                      | Usage |
 | --- | -- |
-| `FROM cics_55` | Provision a CICS TS V5.5 region. |
+| `FROM cics_55` | Provision a CICS TS V5.5 region. Required to support Node.js applications. |
 | `ENV DFH_CICS_TYPE=MAS` | The CICS region should be managed by CPSM. |
 | `ENV DFH_CICSPLEX=` | The name of the CICSplex. |
-| `ENV DFH_NODE_HOME=` | The installation directory for IBM SDK for Node.js - z/OS. |
+| `ENV DFH_NODE_HOME=` | The installation directory for IBM SDK for Node.js - z/OS. Required to support Node.js applications. |
 | `COPY bundles bundles` | Create an empty bundles directory in the provisioned file system to contain CICS bundles. |
 
 For example, to create the z/OS PT image source directory and configuration file, and build it ready for developers to provision CICS regions:
@@ -71,12 +71,11 @@ zospt build $ZOSPTIMAGE -t cics_55_nodejs
 
    The output is in JSON format and includes values for the CICS region application ID, and the z/OS directory within which your CICS bundles can be uploaded. For example:
 
-   ```json
+   <pre class="messageText">
     "DFH_REGION_APPLID": "CICPY000",
-    "DFH_REGION_ZFS_DIRECTORY": "/u/cicprov/mnt/CICPY000",
-    ```
+    "DFH_REGION_ZFS_DIRECTORY": "/u/cicprov/mnt/CICPY000",</pre>
 
-4. Update your Zowe cics-deploy profile options.
+4. Update your Zowe CLI cics-deploy profile options.
 
    Update `--scope` to be the value from DFH_REGION_APPLID, and `--bundle-directory` to be a bundles subdirectory of DFH_REGION_ZFS_DIRECTORY. For example:
 
@@ -104,7 +103,7 @@ zowe zos-uss issue ssh "zospt start my_cics_region"
 
 ### Deprovision your CICS region
 
-The CICS region can be stopped and removed using the following command. This will remove the z/OS directory used to upload your CICS bundles:
+The CICS region can be stopped and removed using the following commands. This will remove the z/OS directory used to upload your CICS bundles:
 
 ```console
 zowe zos-uss issue ssh "zospt stop my_cics_region"