Changes in Jenkinsfile [13d2dac:3221a2b]

File:

• Jenkinsfile (modified) (7 diffs)

Jenkinsfile

@@ -102 +102 @@
 
                 echo GitLogMessage()
-
-                // This is a complete hack but it solves problems with automake thinking it needs to regenerate makefiles
-                // We fudged automake/missing to handle that but automake stills bakes prints inside the makefiles
-                // and these cause more problems.
-                sh 'find . -name Makefile.in -exec touch {} +'
         }
 }
@@ -160 +155 @@
 
 def test() {
-        try {
-                build_stage('Test: short', !Settings.RunAllTests) {
-                        dir (BuildDir) {
-                                //Run the tests from the tests directory
-                                sh "make --no-print-directory -C tests archiveerrors=${BuildDir}/tests/crashes/short"
-                        }
-                }
-
-                build_stage('Test: full', Settings.RunAllTests) {
-                        dir (BuildDir) {
-                                        //Run the tests from the tests directory
-                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/full-debug"""
-                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/full-nodebug"""
-                        }
-                }
-        }
-        catch (Exception err) {
-                echo "Archiving core dumps"
-                dir (BuildDir) {
-                        archiveArtifacts artifacts: "tests/crashes/**/*", fingerprint: true
-                }
-                throw err
+        build_stage('Test: short', !Settings.RunAllTests) {
+                dir (BuildDir) {
+                        //Run the tests from the tests directory
+                        sh 'make --no-print-directory -C tests'
+                }
+        }
+
+        build_stage('Test: full', Settings.RunAllTests) {
+                dir (BuildDir) {
+                        //Run the tests from the tests directory
+                        sh 'make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes'
+                        sh 'make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no '
+                }
         }
 }
@@ -215 +201 @@
 
                 //Then publish the results
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'        , groupCompile    , false, 'Compilation')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile.diff'   , groupCompile    , true , 'Compilation (relative)')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'      , groupConcurrency, false, 'Context Switching')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch.diff' , groupConcurrency, true , 'Context Switching (relative)')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'          , groupConcurrency, false, 'Mutual Exclusion')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex.diff'     , groupConcurrency, true , 'Mutual Exclusion (relative)')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'scheduling'     , groupConcurrency, false, 'Internal and External Scheduling')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'scheduling.diff', groupConcurrency, true , 'Internal and External Scheduling (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'       , groupCompile    , false, 'Compilation')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile.diff'  , groupCompile    , true , 'Compilation (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'     , groupConcurrency, false, 'Context Switching')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch.diff', groupConcurrency, true , 'Context Switching (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'         , groupConcurrency, false, 'Mutual Exclusion')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex.diff'    , groupConcurrency, true , 'Mutual Exclusion (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'        , groupConcurrency, false, 'Internal and External Scheduling')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal.diff'   , groupConcurrency, true , 'Internal and External Scheduling (relative)')
         }
 }
@@ -229 +215 @@
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
-@NonCPS
-def SplitLines(String text) {
-        def list = []
-
-        text.eachLine {
-                list += it
-        }
-
-        return list
-}
-
 def GitLogMessage() {
         if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
 
-        def oldRef = Settings.GitOldRef
-        def newRef = Settings.GitNewRef
-
-        def revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
-        def revList = SplitLines( revText )
-
-        def gitUpdate = ""
-        revList.each { rev ->
-                def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
-                gitUpdate = gitUpdate + "       via  ${rev} (${type})"
-        }
-
-        def rev = oldRef
-        def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
-        gitUpdate = gitUpdate + "      from  ${rev} (${type})"
-
-        def gitLog    = sh(returnStdout: true, script: "git rev-list --format=short ${oldRef}...${newRef}").trim()
-
-        def gitDiff   = sh(returnStdout: true, script: "git diff --stat --color ${newRef} ${oldRef}").trim()
-        gitDiff = gitDiff.replace('[32m', '<span style="color: #00AA00;">')
-        gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
-        gitDiff = gitDiff.replace('[m', '</span>')
+        sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
+
+        def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
+        def gitLog    = readFile("${BuildDir}/GIT_LOG")
+        def gitDiff   = readFile("${BuildDir}/GIT_DIFF")
 
         return """
@@ -363 +321 @@
         BuildSettings(java.util.Collections$UnmodifiableMap param, String branch) {
                 switch( param.Compiler ) {
-                        case 'gcc-9':
-                                this.Compiler = new CC_Desc('gcc-9', 'g++-9', 'gcc-9')
-                        break
-                        case 'gcc-8':
-                                this.Compiler = new CC_Desc('gcc-8', 'g++-8', 'gcc-8')
-                        break
-                        case 'gcc-7':
-                                this.Compiler = new CC_Desc('gcc-7', 'g++-7', 'gcc-7')
-                        break
                         case 'gcc-6':
                                 this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
@@ -382 +331 @@
                         break
                         case 'clang':
-                                this.Compiler = new CC_Desc('clang', 'clang++-6.0', 'gcc-6')
+                                this.Compiler = new CC_Desc('clang', 'clang++', 'gcc-6')
                         break
                         default :
@@ -444 +393 @@
                                         description: 'Which compiler to use',                                   \
                                         name: 'Compiler',                                                                       \
-                                        choices: 'gcc-9\ngcc-8\ngcc-7\ngcc-6\ngcc-5\ngcc-4.9\nclang',                                   \
-                                        defaultValue: 'gcc-8',                                                          \
+                                        choices: 'gcc-6\ngcc-5\ngcc-4.9\nclang',                                        \
+                                        defaultValue: 'gcc-6',                                                          \
                                 ],                                                                                              \
                                 [$class: 'ChoiceParameterDefinition',                                           \