Changes in Jenkinsfile [ab60d6d:b67dc146]

File:

• Jenkinsfile (modified) (6 diffs)

Jenkinsfile

@@ -64 +64 @@
 }
 
-//Helper routine to collect information about the git history
-def collect_git_info() {
-
-        def out_dir = pwd tmp: true
-        gitRefName = env.BRANCH_NAME
-        dir("../${gitRefName}@script") {
-                sh "git reflog > ${out_dir}/GIT_COMMIT"
-        }
-        git_reflog = readFile("${out_dir}/GIT_COMMIT")
-        gitRefOldValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][1]
-        gitRefNewValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][2]
-}
-
 //===========================================================================================================
 // Main loop of the compilation
@@ -85 +72 @@
         def log_needed = false
         currentBuild.result = "SUCCESS"
-        status_prefix = ''
+
+        //Properties sent by the git-hooks (ref name, latest commit hash, previous commit hash)
+        properties( [[$class: 'ParametersDefinitionProperty', parameterDefinitions: \
+                        [[$class: 'StringParameterDefinition', name: 'GitRefName',     defaultValue: 'master', description: 'name of the ref that changed' ], \
+                         [$class: 'StringParameterDefinition', name: 'GitRefNewValue', defaultValue: 'HEAD',   description: 'new commit of the reference' ],  \
+                         [$class: 'StringParameterDefinition', name: 'GitRefOldValue', defaultValue: 'HEAD~1', description: 'old commit of the reference']]   \
+                ]] )
 
         try {
+                echo "Properties-start"
+                echo "ref name      : ${GitRefName}"
+                echo "ref new value : ${GitRefNewValue}"
+                echo "ref old value : ${GitRefOldValue}"
+                echo "Properties-stop"
+
                 //Prevent the build from exceeding 30 minutes
                 timeout(30) {
@@ -93 +92 @@
                         //Wrap build to add timestamp to command line
                         wrap([$class: 'TimestamperBuildWrapper']) {
-
-                                collect_git_info()
 
                                 //Compile using gcc-4.9
@@ -110 +107 @@
                         }
                 }
+
         }
 
@@ -144 +142 @@
         def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
 
-        sh "git rev-list --format=short ${gitRefOldValue}...${gitRefNewValue} > GIT_LOG"
-        def gitLog = readFile('GIT_LOG')
-
-        sh "git diff --stat ${gitRefNewValue} ${gitRefOldValue} > GIT_DIFF"
-        def gitDiff = readFile('GIT_DIFF')
-
         def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${status}] - branch ${env.BRANCH_NAME}"
         def email_body = """This is an automated email from the Jenkins build machine. It was
@@ -157 +149 @@
 
 The branch ${env.BRANCH_NAME} has been updated.
-         via  ${gitRefOldValue} (commit)
-        from  ${gitRefNewValue} (commit)
 
-Check console output at ${env.BUILD_URL} to view the results.
+Check console output at ${env.BUILD_URL} to view the results."""
 
-- Status --------------------------------------------------------------
-
-BUILD# ${env.BUILD_NUMBER} - ${status}
-
-- Log -----------------------------------------------------------------
-${gitLog}
------------------------------------------------------------------------
-Summary of changes:
-${gitDiff}
-"""
-
+        // def config = new File('/u/cforall/software/cfa/cfa-cc/config').text
+        // def email_to = (config =~ /mailinglist ?= ?(.+)/)[0][1]
         def email_to = "pabuhr@uwaterloo.ca, rschlunt@uwaterloo.ca, a3moss@uwaterloo.ca, tdelisle@uwaterloo.ca, brice.dobry@huawei.com"