Changeset 58fe85a for Jenkins/FullBuild

Timestamp:

Jan 7, 2021, 3:27:00 PM (5 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, stuck-waitfor-destruct

Children:

2b4daf2, 64aeca0

Parents:

3c64c668 (diff), eef8dfb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into park_unpark

File:

• Jenkins/FullBuild (modified) (6 diffs)

Jenkins/FullBuild

@@ -8 +8 @@
         def err = null
 
+        final scmVars = checkout scm
+        final commitId = scmVars.GIT_COMMIT
+
         try {
                 //Wrap build to add timestamp to command line
@@ -14 +17 @@
                         stage('Build') {
 
-                                results = [null, null]
+                                parallel (
+                                        gcc_8_x86_old: { trigger_build( 'gcc-8',   'x86', false ) },
+                                        gcc_7_x86_old: { trigger_build( 'gcc-7',   'x86', false ) },
+                                        gcc_6_x86_old: { trigger_build( 'gcc-6',   'x86', false ) },
+                                        gcc_9_x64_old: { trigger_build( 'gcc-9',   'x64', false ) },
+                                        gcc_8_x64_old: { trigger_build( 'gcc-8',   'x64', false ) },
+                                        gcc_7_x64_old: { trigger_build( 'gcc-7',   'x64', false ) },
+                                        gcc_6_x64_old: { trigger_build( 'gcc-6',   'x64', false ) },
+                                        gcc_5_x64_old: { trigger_build( 'gcc-5',   'x64', false ) },
+                                        clang_x64_old: { trigger_build( 'clang',   'x64', false ) },
+                                        clang_x64_new: { trigger_build( 'clang',   'x64', true  ) },
+                                )
+                        }
 
-                                parallel (
-                                        clang_x86: { trigger_build( 'gcc-8',   'x86' ) },
-                                        gcc_5_x86: { trigger_build( 'gcc-7',   'x86' ) },
-                                        gcc_6_x86: { trigger_build( 'gcc-6',   'x86' ) },
-                                        gcc_9_x64: { trigger_build( 'gcc-9',   'x64' ) },
-                                        gcc_8_x64: { trigger_build( 'gcc-8',   'x64' ) },
-                                        gcc_7_x64: { trigger_build( 'gcc-7',   'x64' ) },
-                                        gcc_6_x64: { trigger_build( 'gcc-6',   'x64' ) },
-                                        gcc_5_x64: { trigger_build( 'gcc-5',   'x64' ) },
-                                        clang_x64: { trigger_build( 'clang',   'x64' ) },
-                                )
+                        stage('Package') {
+                                trigger_dist( commitId, currentBuild.number.toString() )
                         }
                 }
@@ -59 +65 @@
 //===========================================================================================================
 
-def trigger_build(String cc, String arch) {
+def trigger_build(String cc, String arch, boolean new_ast) {
         def result = build job: 'Cforall/master',               \
                 parameters: [                                           \
@@ -68 +74 @@
                           name: 'Architecture',                         \
                           value: arch],                                 \
+                        [$class: 'BooleanParameterValue',               \
+                          name: 'NewAST',                               \
+                          value: new_ast],                              \
                         [$class: 'BooleanParameterValue',               \
                           name: 'RunAllTests',                          \
@@ -79 +88 @@
                         [$class: 'BooleanParameterValue',               \
                           name: 'Publish',                              \
-                          value: true],                                 \
+                          value: true],                                         \
                         [$class: 'BooleanParameterValue',               \
                           name: 'Silent',                               \
@@ -94 +103 @@
 }
 
-//Helper routine to collect information about the git history
-def collect_git_info() {
+def trigger_dist(String commitId, String buildNum) {
+        def result = build job: 'Cforall_Distribute_Ref',       \
+                parameters: [                                           \
+                        string(name: 'GitRef', value: commitId),        \
+                        string(name: 'Build' , value: buildNum) \
+                ],                                                              \
+                propagate: false
 
-        //create the temporary output directory in case it doesn't already exist
-        def out_dir = pwd tmp: true
-        sh "mkdir -p ${out_dir}"
+        echo(result.result)
 
-        //parse git logs to find what changed
-        dir("../Cforall_Full_Build@script") {
-                sh "git reflog > ${out_dir}/GIT_COMMIT"
+        if(result.result != 'SUCCESS') {
+                sh("wget -q -O - https://cforall.uwaterloo.ca/jenkins/job/Cforall_Distribute_Ref/${result.number}/consoleText")
+                error(result.result)
         }
-        git_reflog = readFile("${out_dir}/GIT_COMMIT")
-        gitRefOldValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][1]
-        gitRefNewValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][2]
 }