Changeset 9dd31e7

Timestamp:

Dec 17, 2020, 11:18:24 AM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7522692

Parents:

18e4cd0

Message:

Removed StageName? global as it doesn't seem to work and it's not that useful

Files:

• Jenkins/tools.groovy (modified) (1 diff)
• Jenkinsfile (modified) (2 diffs)

Jenkins/tools.groovy

@@ -6 +6 @@
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 
-// Global for the stage name
-StageName = ''
-
 // wrapper around stage declaretion to be more verbose
 // and allow showing as skipped in the UI
 def BuildStage(String name, boolean run, Closure block ) {
-        StageName = name
-        echo " -------- ${StageName} -------- "
+        echo " -------- ${name} -------- "
         if(run) {
                 stage(name, block)

Jenkinsfile

@@ -27 +27 @@
 
                         node(Settings.Architecture.node) {
-                                try {
-                                        BuildDir  = pwd tmp: true
-                                        SrcDir    = pwd tmp: false
-
-                                        Tools.Clean()
-
-                                        Tools.Checkout()
-
-                                        build()
-
-                                        test()
-
-                                        benchmark()
-
-                                        build_doc()
-
-                                        publish()
-                                }
-                                catch (Exception e) {
-                                        //Store the result of the build log
-                                        currentBuild.result = "${Tools.StageName} FAILURE".trim()
-                                        throw e
-                                }
+                                BuildDir  = pwd tmp: true
+                                SrcDir    = pwd tmp: false
+
+                                Tools.Clean()
+
+                                Tools.Checkout()
+
+                                build()
+
+                                test()
+
+                                benchmark()
+
+                                build_doc()
+
+                                publish()
                         }
 
@@ -61 +54 @@
         //attach the build log to the email
         catch (Exception caughtError) {
-                //An error has occured, the build log is relevent
+                // Store the result of the build log
+                currentBuild.result = "FAILURE"
+
+                // An error has occured, the build log is relevent
                 log_needed = true
 
-                //rethrow error later
+                // rethrow error later
                 err = caughtError
 
-                echo "Error caught, status: ${currentBuild.result}"
+                // print the error so it shows in the log
                 echo err.toString()
         }