Merge remote-tracking branch 'upstream/master' into branch1

pcoop · pcoop · commit d3d3b1bfe93a · 2019-05-29T15:42:35.000+01:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,6 +18,12 @@
  */
 def RELEASE_BRANCHES = ["master"]
 
+/** 
+ * Branches to send notifcations for
+*/
+def NOTIFY_BRANCHES = ["master"]
+
+
 /**
  * The following flags are switches to control which stages of the pipeline to be run.  This is helpful when 
  * testing a specific stage of the pipeline.
@@ -218,7 +224,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")
                 }
             }
@@ -605,8 +611,7 @@ pipeline {
                             if (BRANCH_NAME == MASTER_BRANCH) {
                                 echo "publishing next to $TEST_NPM_REGISTRY"
                                 sh "npm publish --tag next"
-                            }
-                            else {
+                            } else {
                                 echo "publishing latest to $TEST_NPM_REGISTRY"
                                 sh "npm publish --tag latest"
                             }
@@ -617,5 +622,22 @@ pipeline {
                 }
             }
         }
+        
+    }
+    post {
+        unsuccessful {
+            script {
+                if (NOTIFY_BRANCHES.contains(BRANCH_NAME)) {
+                    slackSend (channel: '#cics-node-dev', message: "${env.JOB_NAME} #${env.BUILD_NUMBER} completed - ${currentBuild.result} (<${env.BUILD_URL}|Open>)", tokenCredentialId: 'slack-cics-node-dev')
+                }
+            }
+        }
+        fixed {
+            script {
+                if (NOTIFY_BRANCHES.contains(BRANCH_NAME)) {
+                    slackSend (channel: '#cics-node-dev', message: "${env.JOB_NAME} #${env.BUILD_NUMBER} completed - Back to normal (<${env.BUILD_URL}|Open>)", tokenCredentialId: 'slack-cics-node-dev')
+                }
+            }
+        }
     }
 }
diff --git a/docs/_data/sidebars/cdp_sidebar.yml b/docs/_data/sidebars/cdp_sidebar.yml
@@ -30,7 +30,7 @@ entries:
     - title: Deploying using individual actions
       url: /cdp-Deploying-using-individual-actions.html
       output: web
-    - title: Provision a CICS region using z/OS PT
+    - title: Provision a CICS region with z/OS PT
       url: /cdp-Provision-a-CICS-region-using-zospt.html
       output: web
 
@@ -53,6 +53,9 @@ entries:
     - title: Log and trace files
       url: /cdp-Troubleshooting-General.html
       output: web
+    - title: Precautionary checks
+      url: /cdp-Precautionary-Checks.html
+      output: web
     - title: Potential problems
       url: /cdp-Troubleshooting-Symptoms.html
       output: web
diff --git a/docs/pages/cdp/cdp-Installation.md b/docs/pages/cdp/cdp-Installation.md
@@ -2,7 +2,7 @@
 title: Installation
 tags: [getting_started]
 keywords:
-summary: "To install the Zowe CLI and cics-deploy plugin, perform the following steps."
+summary: "To install the Zowe CLI and cics-deploy plugin, perform the following steps. For clarity, these components are installed on your local workstation, not on z/OS."
 sidebar: cdp_sidebar
 permalink: cdp-Installation.html
 folder: cdp
diff --git a/docs/pages/cdp/cdp-Precautionary-Checks.md b/docs/pages/cdp/cdp-Precautionary-Checks.md
@@ -0,0 +1,13 @@
+---
+title: Precautionary checks
+tags: [troubleshooting]
+keywords: 
+summary: "You can sometimes fix problems quickly by eliminating the following possible causes instead of individually tracing their origins through several log files."
+sidebar: cdp_sidebar
+permalink: cdp-Precautionary-Checks.html
+folder: cdp
+---
+
+* CICS must be authorized to read the bundle directory `META-INF`.
+* The port specified by the `--port` argument of the `cics-deploy generate bundle` command *must* be free on the z/OS machine before you attempt to deploy an application. 
+* If you set a `WORK_DIR` in the CICS Node.js application profile, such as `nodejsapps/<your application name>.profile`, it must be *writeable* by CICS.
diff --git a/docs/pages/cdp/cdp-Troubleshooting-General.md b/docs/pages/cdp/cdp-Troubleshooting-General.md
@@ -57,5 +57,5 @@ They can all be useful when identifying the cause of an error, especially STDERR
 ### JES job logs
 DFHDPLOY is a CICS utility which provides a set of commands that you can use to deploy, undeploy and set the state of CICS bundles. When you deploy or undeploy a Node.js application to or from CICS, a batch DFHDPLOY job is initiated on z/OS.
 
-If you are familiar with the z/OS environment, you can often find some useful diagnostics by accessing z/OS file assigned to the MSGUSR DD name for the deploy/undeploy job associated with your CICS region. If you are not so fluent with the world of z/OS, you may need to discuss your needs with one of your organization's CICS Systems Programmers.
+If you are familiar with the z/OS environment, you can often find some useful diagnostics by accessing z/OS file assigned to the MSGUSR DD name for the deploy/undeploy job associated with your CICS region. If you are not so fluent with the world of z/OS, you may need to discuss your needs with one of your organization's CICS system administrators.
 
diff --git a/docs/pages/cdp/cdp-Troubleshooting-Symptoms.md b/docs/pages/cdp/cdp-Troubleshooting-Symptoms.md
@@ -1,5 +1,5 @@
 ---
-title: Possible problems and their resolution
+title: Possible problems and their resolutions
 tags: [troubleshooting]
 keywords:
 summary: "This section describes sets of problem symptoms, their possible causes and suggested solutions."
@@ -8,7 +8,7 @@ permalink: cdp-Troubleshooting-Symptoms.html
 folder: cdp
 ---
 
-{% include important.html content="To definitively diagnose a problem based on the suggested symptoms, you will need to refer to one or more [system logs and traces](cdp-Troubleshooting-General) particularly the STDERR Node.js log and the file assigned the MSGUSR DD name in the relevant CICS DFHDPLOY job. Depending on your familiarity with z/OS and CICS, and your system privileges, you may need to consult a CICS Systems Programmer to get to the bottom of certain problems." %}
+{% include important.html content="To definitively diagnose a problem based on the suggested symptoms, you might need to refer to one or more [system logs and traces](cdp-Troubleshooting-General) particularly the STDERR Node.js log and the file assigned the MSGUSR DD name in the relevant CICS DFHDPLOY job. Depending on your familiarity with z/OS and CICS, and your system privileges, you may also need to consult a CICS systems administrator to get to the bottom of certain problems." %}
 
 ## Deployment errors
 
@@ -42,10 +42,64 @@ folder: cdp
 
   * Ask your CICS Systems Programmer to check that the CMAS for the current CICSPlex is alive and that CPSM is working properly.
 
+### Command error: ... validation of - -cicshlq dataset failed: z/OSMF REST API Error
+*Possible cause*: The profile setting for `--cicshlq` is incorrect.
 
+*Representative output*:
+<pre class="messageText">
+A failure occurred during CICS bundle deployment.
+Reason = Validation of --cicshlq dataset failed: z/OSMF REST API Error:
+Rest API failure with HTTP(S) status 404
+category: 4
+rc:       8
+reason:   0
+message:  LMINIT error
+details:
+  - ISRZ002 Data set not cataloged - 'ANT.CICS.TS.DEV.INTEGRAT.SDFHLOAD' was not found in catalog.
+</pre>
+
+*Suggested action*: 
+Check that your `--cicshlq` profile setting matches the value configured for CICS high-level qualifiers in your CICS region. 
+
+### BUNDLE ... cannot be deployed
+*Possible cause*: The `cics.xml` file is malformed.
+
+*Representative output*:
+<pre class="messageText">
+15:56:17.411714 :  DFHRL2300E BUNDLE(CICSJS02) cannot be deployed. The reason for the failure could not be determined.
+15:56:17.419308 :  DFHRL2055I Errors have occurred, processing terminated.
+15:56:17.424650 :  DFHRL2014I Disconnecting from CICSPLEX(CAPLEX).
+...
+DFHRL0107 I 05/17/2019 15:56:15 CALMAS1 CICSUSER The CICS resource lifecycle manager has started to create the BUNDLE resource      
+           CICSJS02.                                                                                                                
+DFHPI1007 05/17/2019 15:56:15 CALMAS1 COIE 00672 XML to data transformation failed because of incorrect input                       
+           (MISSING_CLOSE_TAG_CHAR manifest) for BUNDLE CICSJS02.                                                                   
+DFHRL0113 E 05/17/2019 15:56:15 CALMAS1 COIE The CICS resource lifecycle manager failed to create the BUNDLE resource CICSJS02      
+           because CICS failed to parse the manifest /u/&lt;your user id>/pushtest2/CICSJSON_1.0.0/META-INF/cics.xml specified in the bundle   
+           root directory. The manifest is not valid.                                                                               
+</pre>
+
+*Suggested action*: 
+Check that your `cics.xml` file is well-formed.
 
 ## General errors
+### Syntax error: Invalid value length for option
+*Possible cause*: The length of the option you provided in a command was either too long or two short.
+
+*Representative output*:
+<pre class="messageText">
+Syntax Error:
+Invalid value length for option:
+--csdgroup
+
+You specified a string of length 9:
+NODETESTS
+
+The length must be between 1 and 8 (inclusive)
+</pre>
+
+*Suggested action*: 
+Review the error output text and reissue the original command having corrected the name of the option so that its length falls within acceptable limits. 
 
-TBC 
 
 
