Merge branch 'master' into master

Author: cxharris

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.
@@ -56,18 +62,18 @@ def UNIT_RESULTS = "${TEST_RESULTS_FOLDER}/unit"
 /**
  * The location of the system test results
  */
- def SYSTEM_RESULTS = "${TEST_RESULTS_FOLDER}/system"
+def SYSTEM_RESULTS = "${TEST_RESULTS_FOLDER}/system"
 
 /**
  * The name of the master branch
  */
 def MASTER_BRANCH = "master"
 
-
 /**
- * A command to be run that gets the current revision pulled down
+ * Variables to check any new commit since the previous successful commit
  */
-def GIT_REVISION_LOOKUP = 'git log -n 1 --pretty=format:%h'
+def GIT_COMMIT = "null"
+def GIT_PREVIOUS_SUCCESSFUL_COMMIT = "null"
 
 /**
  * This is the product name used by the build machine to store information about
@@ -86,6 +92,10 @@ def ARTIFACTORY_CREDENTIALS_ID = "c8e3aa62-5eef-4e6b-8a3f-aa1006a7ef01"
 // much impossible to have conditional options based on the branch :/
 def opts = []
 
+// Setup a schedule to run build periodically
+// Run a build at 2.00AM everyday
+def CRON_STRING = BRANCH_NAME == MASTER_BRANCH ? "H 2 * * *" : ""
+
 if (RELEASE_BRANCHES.contains(BRANCH_NAME)) {
     // Only keep 20 builds
     opts.push(buildDiscarder(logRotator(numToKeepStr: '20')))
@@ -109,6 +119,10 @@ pipeline {
         skipDefaultCheckout true
     }
 
+    triggers {
+        cron(CRON_STRING)
+    }
+
     environment {
         // Environment variable for flow control. Indicates if the git source was updated by the pipeline.
         GIT_SOURCE_UPDATED = "false"
@@ -124,8 +138,13 @@ pipeline {
         stage("Clean workspace and checkout source") {
             steps {
                 timeout(time: 5, unit: 'MINUTES') {
-                    cleanWs()
-                    checkout scm
+                    script {
+                        cleanWs()
+                        scmInfo = checkout scm
+
+                        GIT_COMMIT = scmInfo.GIT_COMMIT
+                        GIT_PREVIOUS_SUCCESSFUL_COMMIT = scmInfo.GIT_PREVIOUS_SUCCESSFUL_COMMIT
+                    }
                 }
             }
         } 
@@ -158,12 +177,6 @@ pipeline {
             steps {
                 timeout(time: 2, unit: 'MINUTES') {
                     script {
-                        // We need to keep track of the current commit revision. This is to prevent the condition where
-                        // the build starts on master and another branch gets merged to master prior to version bump
-                        // commit taking place. If left unhandled, the version bump could be done on latest master branch
-                        // code which would already be ahead of this build.
-                        BUILD_REVISION = sh returnStdout: true, script: GIT_REVISION_LOOKUP
-
                         // This checks for the [ci skip] text. If found, the status code is 0
                         def result = sh returnStatus: true, script: 'git log -1 | grep \'.*\\[ci skip\\].*\''
                         if (result == 0) {
@@ -537,7 +550,7 @@ pipeline {
                         return BRANCH_NAME == MASTER_BRANCH
                     }
                     expression {
-                        return GIT_COMMIT =! GIT_PREVIOUS_SUCCESSFUL_COMMIT
+                        return GIT_COMMIT != GIT_PREVIOUS_SUCCESSFUL_COMMIT
                     }
                 }
             }
@@ -588,10 +601,10 @@ pipeline {
                         return PIPELINE_CONTROL.deploy
                     }
                     expression {
-                       return BRANCH_NAME == MASTER_BRANCH
+                        return BRANCH_NAME == MASTER_BRANCH
                     }
                     expression {
-                        return GIT_COMMIT =! GIT_PREVIOUS_SUCCESSFUL_COMMIT
+                        return GIT_COMMIT != GIT_PREVIOUS_SUCCESSFUL_COMMIT
                     }
                 }
             }
@@ -611,8 +624,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"
                             }
@@ -624,4 +636,20 @@ 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')
+                }
+            }
+        }
+    }
 }

__tests__/api/BundleDeploy/BundleDeployer.test.ts

@@ -12,7 +12,6 @@
 import { BundleDeployer } from "../../../src/api/BundleDeploy/BundleDeployer";
 import { IHandlerParameters, TaskStage } from "@zowe/imperative";
 import * as DeployBundleDefinition from "../../../src/cli/deploy/bundle/DeployBundle.definition";
-import * as fse from "fs-extra";
 import { ZosmfSession, SubmitJobs, List } from "@zowe/cli";
 
 
@@ -69,6 +68,9 @@ describe("BundleDeployer01", () => {
     });
     afterEach(() => {
         jest.restoreAllMocks();
+        (DEFAULT_PARAMTERS.response.progress.startBar as jest.Mock).mockReset();
+        (DEFAULT_PARAMTERS.response.progress.endBar as jest.Mock).mockReset();
+
     });
     it("should complain with missing zOSMF profile for deploy", async () => {
         createSpy.mockImplementationOnce(() => { throw new Error( "Injected Create error" ); });
@@ -124,7 +126,7 @@ describe("BundleDeployer01", () => {
         submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementationOnce((session: any, jcl: string, parms: any) => {
                 parms.task.statusMessage = "Waiting for JOB12345 to enter OUTPUT";
                 parms.task.stageName = TaskStage.IN_PROGRESS;
-                const expectedMsg = "Running DFHDPLOY (DEPLOY), job JOB12345";
+                const expectedMsg = "Running DFHDPLOY (DEPLOY), jobid JOB12345";
                 // wait 1.5 seconds
                 return new Promise((resolve, reject) => {
                   setTimeout(() => {
@@ -506,6 +508,24 @@ describe("BundleDeployer01", () => {
         parms.arguments.verbose = false;
         await testUndeployJCL(parms);
     });
+
+    it("should use task passed as parameter on deploy", async () => {
+        submitSpy.mockImplementationOnce(() => [{ddName: "SYSTSPRT", stepName: "DFHDPLOY", data: "DFHRL2012I"}] );
+
+        let parms: IHandlerParameters;
+        parms = DEFAULT_PARAMTERS;
+        setCommonParmsForDeployTests(parms);
+        parms.arguments.csdgroup = "12345678";
+
+        const bd = new BundleDeployer(parms);
+        const task = { percentComplete: 0, stageName: TaskStage.NOT_STARTED, statusMessage: ""};
+        const response = await bd.deployBundle(undefined, task);
+        expect(task.stageName).toEqual(TaskStage.COMPLETE);
+        expect(task.statusMessage).toEqual("Completed DFHDPLOY");
+        expect(parms.response.progress.startBar).toHaveBeenCalledTimes(0);
+        expect(parms.response.progress.endBar).toHaveBeenCalledTimes(0);
+
+    });
 });
 
 async function runDeployTestWithError() {

__tests__/api/BundleDeploy/__snapshots__/BundleDeployer.test.ts.snap

@@ -2,9 +2,9 @@
 
 exports[`BundleDeployer01 should complain if DFHDPLOY ends with an error 1`] = `"DFHRL2055I"`;
 
-exports[`BundleDeployer01 should complain if DFHDPLOY ends with an error 2`] = `"DFHDPLOY stopped processing for JOBID UNKNOWN due to an error."`;
+exports[`BundleDeployer01 should complain if DFHDPLOY ends with an error 2`] = `"DFHDPLOY stopped processing for jobid UNKNOWN due to an error."`;
 
-exports[`BundleDeployer01 should complain if SYSTSPRT not found 1`] = `"SYSTSPRT and JESMSGLG output from DFHDPLOY not found for JOBID UNKNOWN. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
+exports[`BundleDeployer01 should complain if SYSTSPRT not found 1`] = `"SYSTSPRT and JESMSGLG output from DFHDPLOY not found for jobid UNKNOWN. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
 
 exports[`BundleDeployer01 should complain if cicshlq not found 1`] = `"Validation of --cicshlq dataset failed: Injected CICSHLQ error"`;
 
@@ -16,7 +16,7 @@ exports[`BundleDeployer01 should complain if cpsmhlq not found2 1`] = `"EYU9ABSI
 
 exports[`BundleDeployer01 should complain if status can't be determined 1`] = `" "`;
 
-exports[`BundleDeployer01 should complain if status can't be determined 2`] = `"DFHDPLOY command completed for JOBID UNKNOWN, but status cannot be determined."`;
+exports[`BundleDeployer01 should complain if status can't be determined 2`] = `"DFHDPLOY command completed for jobid UNKNOWN, but status cannot be determined."`;
 
 exports[`BundleDeployer01 should complain with missing zOSMF profile for deploy 1`] = `"Injected Create error"`;
 
@@ -32,7 +32,7 @@ exports[`BundleDeployer01 should fail with overlong jobcard 1`] = `"--jobcard pa
 
 exports[`BundleDeployer01 should failover to JESMSGLG if SYSTSPRT not found 1`] = `"undefined"`;
 
-exports[`BundleDeployer01 should failover to JESMSGLG if SYSTSPRT not found 2`] = `"DFHDPLOY command completed in error for JOBID UNKNOWN without generating SYSTSPRT output."`;
+exports[`BundleDeployer01 should failover to JESMSGLG if SYSTSPRT not found 2`] = `"DFHDPLOY command completed in error for jobid UNKNOWN without generating SYSTSPRT output."`;
 
 exports[`BundleDeployer01 should generate deploy JCL for AVAILABLE 1`] = `
 "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
@@ -369,9 +369,9 @@ UNDEPLOY BUNDLE(12345678)
 "
 `;
 
-exports[`BundleDeployer01 should handle failure during submitjobs processing 1`] = `"Failure occurred submitting DFHDPLOY JCL for JOBID UNKNOWN: 'Injected Submit error'. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
+exports[`BundleDeployer01 should handle failure during submitjobs processing 1`] = `"Failure occurred submitting DFHDPLOY JCL for jobid UNKNOWN: 'Injected Submit error'. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
 
-exports[`BundleDeployer01 should include the JOBID in an error 1`] = `"Failure occurred submitting DFHDPLOY JCL for JOBID JOB12345: 'Injected submit error'. Most recent status update: 'Running DFHDPLOY (DEPLOY), job JOB12345'."`;
+exports[`BundleDeployer01 should include the JOBID in an error 1`] = `"Failure occurred submitting DFHDPLOY JCL for jobid JOB12345: 'Injected submit error'. Most recent status update: 'Running DFHDPLOY (DEPLOY), jobid JOB12345'."`;
 
 exports[`BundleDeployer01 should support long bundledir 1`] = `
 "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
@@ -594,7 +594,7 @@ DEPLOY BUNDLE(12345678)
 "
 `;
 
-exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 1`] = `"DFHDPLOY did not generate any output for JOBID UNKNOWN. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
+exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 1`] = `"DFHDPLOY did not generate any output for jobid UNKNOWN. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
 
 exports[`BundleDeployer01 should undeploy successfully 1`] = `"Bundle undeployment successful."`;