SRE-2932 Fix notifyBrokenBranch

vars/notifyBrokenBranch.grooy:
  This routine was doing a lookup of the enviroment Map which is not
  allowed in the pipeline-lib sandboxed operation.

vars/DocOnlyChange.groovy:
  Missing a String declaration that was causing log noise.

Signed-off-by: John E. Malmberg <[email protected]>

Author: JohnMalmberg

vars/docOnlyChange.groovy

@@ -17,6 +17,7 @@ boolean call(String target_branch) {
     if (cachedCommitPragma('Doc-only').toLowerCase() == 'false') {
         return false
     }
+    String script
     if (fileExists('ci/doc_only_change.sh')) {
         script = 'CHANGE_ID=' + env.CHANGE_ID +
                  ' TARGET_BRANCH=' + target_branch +

vars/notifyBrokenBranch.groovy

@@ -1,4 +1,5 @@
 // vars/notifyBrokenBranch.groovy
+/* groovylint-disable VariableName */
 
 /**
  * notifyBrokenBranch.groovy
@@ -12,37 +13,47 @@
 
 def call(Map config = [:]) {
 
+    String branches
     if (config['branches']) {
         branches = config['branches'].split()
     } else {
         branches = ["master"]
     }
 
-    if (!branches.contains(env.GIT_BRANCH)) {
+    // Needed this as a work around that env['GIT_BRANCH'] is blacklisted
+    // inside of pipeline-lib
+    String git_branch = env.GIT_BRANCH
+
+    if (!branches.contains(git_branch)) {
         return
     }
 
-    emailextDaos body: env.GIT_BRANCH + ' is broken and you are one of the people\n' +
+    emailextDaos body: git_branch + ' is broken and you are one of the people\n' +
                        'who have committed to it since it was last successful.  Please\n' +
-                       'investigate if your recent patch(es) to ' + env.GIT_BRANCH + '\n' +
+                       'investigate if your recent patch(es) to ' + git_branch + '\n' +
                        'are responsible for breaking it.\n\n' +
                        'See ' + env.BUILD_URL + ' for more details.',
                  recipientProviders: [
                      [$class: 'DevelopersRecipientProvider'],
                      [$class: 'RequesterRecipientProvider']
                  ],
-                 subject: 'Build broken on ' + env.GIT_BRANCH,
+                 subject: 'Build broken on ' + git_branch,
                  onPR: config['onPR']
 
-    def branch = env['GIT_BRANCH'].toUpperCase().replaceAll("-", "_")
-    def watchers = env["DAOS_STACK_${branch}_WATCHER"]
-
-    if (watchers != "null") {
-        emailextDaos body: env.GIT_BRANCH + ' is broken.\n\n' +
-                           'See ' + env.BUILD_URL + ' for more details.',
-                     to: watchers,
-                     subject: 'Build broken on ' + env.GIT_BRANCH,
-                     onPR: config['onPR']
+    String branch = git_branch.toUpperCase().replaceAll("-", "_")
+    // This will need to be implemented in trusted-pipe-line lib eventually
+    // as checking if environment variables exist is blacklisted in the
+    // groovy sandbox.
+    // for now we only have DAOS_STACK_MASTER_WATCHER
+    // def watchers = env["DAOS_STACK_${branch}_WATCHER"]
+    if (branch == 'MASTER') {
+        String watchers = env.DAOS_STACK_MASTER_WATCHER
+        if (watchers != "null") {
+            emailextDaos body: git_branch + ' is broken.\n\n' +
+                               'See ' + env.BUILD_URL + ' for more details.',
+                         to: watchers,
+                         subject: 'Build broken on ' + git_branch,
+                         onPR: config['onPR']
+        }
     }
-    
 }

vars/unitTest.groovy

@@ -26,7 +26,7 @@
    * config['description']       Description to report for SCM status.
    *                             Default env.STAGE_NAME.
    *
-   * config['failure_artifacts'] Failure aritfifacts to return.
+   * config['failure_artifacts'] Failure artifacts to return.
    *                             Default env.STAGE_NAME.
    *
    * config['ignore_failure']    Ignore test failures.  Default false.
@@ -43,10 +43,10 @@
    *
    * config['node_count']        Count of nodes that will actually be used
    *                             the test.  Default will be based on the
-   *                             enviroment variables for the stage.
+   *                             environment variables for the stage.
    *
    * config['stashes']           List of stashes to use.  Default will be
-   *                             baed on the environment variables for the
+   *                             based on the environment variables for the
    *                             stage.
    *
    * config['target']            Target distribution, such as 'centos7',
@@ -61,16 +61,16 @@
    *                             SSH_KEY_ARGS and NODELIST environment
    *                             variables set.
    *
-   * config['timeout_time']      Timelimit for test run, not including
+   * config['timeout_time']      Time limit for test run, not including
    *                             provisioning time.
    *                             Default is 120 Minutes.
    *
-   * config['timeout_units']     Timelimit units.  Default is minutes.
+   * config['timeout_units']     Time limit units.  Default is minutes.
    *
-   * config['unstash_opt']       Unstash -opt-tar instead of -opt,
+   * config['unstash_opt']       Un-stash -opt-tar instead of -opt,
    *                             default is false.
    *
-   * config['unstash_tests']     Unstash -tests, default is true.
+   * config['unstash_tests']     Un-stash -tests, default is true.
    */
 
 Map afterTest(Map config, Map testRunInfo) {
@@ -137,6 +137,15 @@ Map call(Map config = [:]) {
         }
     }
 
+    println("1 ###############################################")
+    println("       unitTest  - provisionNodes ")
+    println("config = ${config}")
+    println("nodelist = ${nodelist}")
+    println("node_count = ${stage_info['node_count']}")
+    println("ci_target = ${stage_info['ci_target']}")
+    println("distro_version = ${stage_info['distro_version']}")
+    println("inst_rpms = ${inst_rpms}")
+    println("1 ###############################################")
     Map runData = provisionNodes(
                  NODELIST: nodelist,
                  node_count: stage_info['node_count'],