Merge branch 'staging' into users/stevenh/zip-1603

Jenkinsfile.nightly

@@ -21,6 +21,7 @@ node('ibm-jenkins-slave-nvm') {
   def ZOWE_CLI_RELEASE_PATH = '/org/zowe/nightly/cli'
   def ZOWE_CLI_BUILD_NAME = 'Zowe CLI Bundle :: master'
   def ZOWE_CLI_BUILD_REPOSITORY = 'libs-snapshot-local'
+  def IS_BUILD_UNSTABLE = false
 
   def isStagingBranch = env && env.BRANCH_NAME == 'staging'
 
@@ -222,7 +223,7 @@ node('ibm-jenkins-slave-nvm') {
         if (test_result.result != 'SUCCESS') {
           testRegBuildErrorUrl = test_result.absoluteUrl
           echo "Test failed on regular build ${sourceRegBuildInfo.path}, check failure details at ${test_result.absoluteUrl}"
-          currentBuild.result = 'UNSTABLE'
+          IS_BUILD_UNSTABLE = true
         }
       }
     },
@@ -280,7 +281,7 @@ node('ibm-jenkins-slave-nvm') {
         if (test_result.result != 'SUCCESS') {
           testSmpeBuildErrorUrl = test_result.absoluteUrl
           echo "Test failed on SMP/e build ${sourceSmpeBuildInfo.path}, check failure details at ${test_result.absoluteUrl}"
-          currentBuild.result = 'UNSTABLE'
+          IS_BUILD_UNSTABLE = true
         }
       }
     },
@@ -363,6 +364,9 @@ node('ibm-jenkins-slave-nvm') {
            "*************************************************************************************************"
 
       def slackMessage = "${message}\n\nCheck pipeline detail: ${env.BUILD_URL}"
+      if (IS_BUILD_UNSTABLE) {
+        currentBuild.result = 'UNSTABLE'
+      }
       if (params.TEST_RUN) {
         echo "Slack message in ${slackColor}:\n${slackMessage}"
       } else {

smpe/bld/service/current-hold-ACTION.txt

@@ -0,0 +1,20 @@
+****************************************************************
+* Affected function: Zowe z/OSMF pre req                       *
+****************************************************************
+* Description: Install required z/OSMF PTF                     *
+****************************************************************
+* Timing: pre-APPLY                                           *
+****************************************************************
+* Part: z/OSMF install                                         *
+****************************************************************
+
+Zowe API Mediation Layer Authentication service cannot function
+fully unless z/OSMF JWT support is available. Ensure PTFs
+associated with APAR PH12143: NEW FUNCTION - z/OSMF JWT support
+https://www.ibm.com/support/pages/apar/PH12143 are applied, 
+Applicable component levels
+R230 PSY UI66511   UP19/12/11 P F912  
+R240 PSY UI66512   UP19/12/11 P F912 
+
+Without the z/OSMF JWT support available warnings will appear in
+the Zowe logs when the required functions are called.