Changeset cc5544a


Ignore:
Timestamp:
Jun 10, 2021, 9:16:51 AM (16 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
3dcd11ba
Parents:
bd50205
Message:

Simplified how jenkins produces the git message.
FullBuild? now retrieves errors from jenkins url rather than local host.
Added promote script to repo

Location:
Jenkins
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • Jenkins/FullBuild

    rbd50205 rcc5544a  
    106106
    107107        if(result.result != 'SUCCESS') {
    108                 sh("wget -q -O - http://localhost:8084/jenkins/job/Cforall/job/master/${result.number}/consoleText")
     108                sh("wget -q -O - https://cforall.uwaterloo.ca/jenkins/job/Cforall/job/master/${result.number}/consoleText")
    109109                error(result.result)
    110110        }
  • Jenkins/tools.groovy

    rbd50205 rcc5544a  
    6161}
    6262
    63 PrevGitOldRef = ''
    64 PrevGitNewRef = ''
    65 def GitLogMessage(String oldRef = '', String newRef = '') {
    66         if (!oldRef) { if(!PrevGitOldRef) { return "\nERROR retrieveing current git information!\n"  } else { oldRef = PrevGitOldRef } }
    67         if (!newRef) { if(!PrevGitNewRef) { return "\nERROR retrieveing previous git information!\n" } else { newRef = PrevGitNewRef } }
    68 
     63def ConstructGitLogMessage(String oldRef, String newRef) {
    6964        def revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
    7065        def revList = SplitLines( revText )
     
    8681        gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
    8782        gitDiff = gitDiff.replace('[m', '</span>')
    88 
    89         PrevGitOldRef = oldRef
    90         PrevGitNewRef = newRef
    9183
    9284        return """
     
    116108}
    117109
     110EmailMessage = ''
     111def GitLogMessage(String oldRef = '', String newRef = '') {
     112        if(!EmailMessage) {
     113                if (!oldRef) { return "\nERROR retrieveing current git information!\n"  }
     114                if (!newRef) { return "\nERROR retrieveing previous git information!\n" }
     115
     116                echo "Constructing new git message"
     117
     118                EmailMessage = ConstructGitLogMessage(oldRef, newRef)
     119        }
     120        else {
     121                echo "Reusing previously constructed message"
     122        }
     123        return EmailMessage;
     124}
     125
    118126return this;
Note: See TracChangeset for help on using the changeset viewer.