Changes in / [0797198:8e655f7c]

Files:

• Jenkins/tools.groovy (deleted)
• Jenkinsfile (modified) (17 diffs)

Jenkinsfile

@@ -2 +2 @@
 
 import groovy.transform.Field
+
+// For skipping stages
+import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 
 //===========================================================================================================
@@ -12 +15 @@
         SrcDir    = pwd tmp: false
         Settings  = null
-        Tools     = null
+        StageName = ''
 
         // Local variables
@@ -63 +66 @@
 
                 //Store the result of the build log
-                currentBuild.result = "${tools.StageName} FAILURE".trim()
+                currentBuild.result = "${StageName} FAILURE".trim()
         }
 
@@ -82 +85 @@
 //===========================================================================================================
 def clean() {
-        Tools.BuildStage('Cleanup', true) {
+        build_stage('Cleanup', true) {
                 // clean the build by wipping the build directory
                 dir(BuildDir) {
@@ -92 +95 @@
 //Compilation script is done here but environnement set-up and error handling is done in main loop
 def checkout() {
-        Tools.BuildStage('Checkout', true) {
+        build_stage('Checkout', true) {
                 //checkout the source code and clean the repo
                 final scmVars = checkout scm
@@ -105 +108 @@
         debug = true
         release = Settings.RunAllTests || Settings.RunBenchmark
-        Tools.BuildStage('Build : configure', true) {
+        build_stage('Build : configure', true) {
                 // Configure must be run inside the tree
                 dir (SrcDir) {
@@ -133 +136 @@
         }
 
-        Tools.BuildStage('Build : cfa-cpp', true) {
+        build_stage('Build : cfa-cpp', true) {
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
@@ -144 +147 @@
         }
 
-        Tools.BuildStage('Build : libcfa(debug)', debug) {
+        build_stage('Build : libcfa(debug)', debug) {
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
@@ -151 +154 @@
         }
 
-        Tools.BuildStage('Build : libcfa(nodebug)', release) {
+        build_stage('Build : libcfa(nodebug)', release) {
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
@@ -158 +161 @@
         }
 
-        Tools.BuildStage('Build : install', true) {
+        build_stage('Build : install', true) {
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
@@ -168 +171 @@
 def test() {
         try {
-                Tools.BuildStage('Test: short', !Settings.RunAllTests) {
+                build_stage('Test: short', !Settings.RunAllTests) {
                         dir (BuildDir) {
                                 //Run the tests from the tests directory
@@ -175 +178 @@
                 }
 
-                Tools.BuildStage('Test: full', Settings.RunAllTests) {
+                build_stage('Test: full', Settings.RunAllTests) {
                         dir (BuildDir) {
                                         //Run the tests from the tests directory
@@ -193 +196 @@
 
 def benchmark() {
-        Tools.BuildStage('Benchmark', Settings.RunBenchmark) {
+        build_stage('Benchmark', Settings.RunBenchmark) {
                 dir (BuildDir) {
                         //Append bench results
@@ -202 +205 @@
 
 def build_doc() {
-        Tools.BuildStage('Documentation', Settings.BuildDocumentation) {
+        build_stage('Documentation', Settings.BuildDocumentation) {
                 dir ('doc/user') {
                         make_doc()
@@ -214 +217 @@
 
 def publish() {
-        Tools.BuildStage('Publish', true) {
+        build_stage('Publish', true) {
 
                 if( Settings.Publish && !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
@@ -503 +506 @@
                 ]])
 
-        // It's unfortunate but it looks like we need to checkout the entire repo just to get
-        // - the pretty git printer
-        // - Jenkins.tools
+        // It's unfortunate but it looks like we need to checkout the entire repo just to get the pretty git printer
         checkout scm
-
-        Tools = load "Jenkins/tools.groovy"
 
         final settings = new BuildSettings(params, env.BRANCH_NAME)
@@ -516 +515 @@
 
         return settings
+}
+
+def build_stage(String name, boolean run, Closure block ) {
+        StageName = name
+        echo " -------- ${StageName} -------- "
+        if(run) {
+                stage(name, block)
+        } else {
+                stage(name) { Utils.markStageSkippedForConditional(STAGE_NAME) }
+        }
 }