Changeset 3a9aceb

Timestamp:

Aug 17, 2018, 2:27:57 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

0fd5003

Parents:

d2c58be

Message:

Removed first unnecessary checkout

File:

• Jenkinsfile (modified) (5 diffs)

Jenkinsfile

@@ -116 +116 @@
         public final Boolean Silent
         public final Boolean IsSandbox
-        public final String Branch
-        public final String Commit
-        public final String PrevCommit
-        public final String RepoUrl
         public final String DescLong
         public final String DescShort
 
-        BuildSettings(java.util.Collections$UnmodifiableMap param, java.util.TreeMap scmVars) {
+        BuildSettings(java.util.Collections$UnmodifiableMap param) {
                 switch( param.Compiler ) {
                         case 'gcc-6':
@@ -157 +153 @@
                 this.Publish            = param.Publish
                 this.Silent             = param.Silent
-                this.IsSandbox          = scmVars.GIT_BRANCH == "jenkins-sandbox"
-                this.Branch             = scmVars.GIT_BRANCH
-                this.Commit             = scmVars.GIT_COMMIT
-                this.PrevCommit         = scmVars.GIT_PREVIOUS_COMMIT
-                this.RepoUrl            = scmVars.GIT_URL
+                this.IsSandbox          = env.BRANCH_NAME == "jenkins-sandbox"
 
                 def full = param.RunAllTests ? " (Full)" : ""
@@ -223 +215 @@
                 ]])
 
-        // Collect git information
-        final scmVars = checkout scm
-
-        echo env.CHANGE_ID
-        echo env.CHANGE_URL
-        echo env.CHANGE_TITLE
-        echo env.CHANGE_AUTHOR
-        echo env.CHANGE_AUTHOR_DISPLAY_NAME
-        echo env.CHANGE_AUTHOR_EMAIL
-        echo env.CHANGE_TARGET
-
-        final settings = new BuildSettings(params, scmVars)
+        final settings = new BuildSettings(params)
 
         currentBuild.description = settings.DescShort
@@ -387 +368 @@
         return update
 
-def output=readFile('result').trim()
-echo "output=$output";
+        def output=readFile('result').trim()
+        echo "output=$output";
 }
 
@@ -402 +383 @@
 
         try {
-                gitUpdate = gitBranchUpdate(Settings.PrevCommit, Settings.Commit)
-
-                sh "git rev-list --format=short ${Settings.PrevCommit}...${Settings.Commit} > GIT_LOG"
+                final scmVars = checkout(scm)
+
+                gitUpdate = gitBranchUpdate(scmVars.GIT_PREVIOUS_COMMIT, scmVars.GIT_COMMIT)
+
+                sh "git rev-list --format=short ${scmVars.GIT_PREVIOUS_COMMIT}...${scmVars.GIT_COMMIT} > GIT_LOG"
                 gitLog = readFile('GIT_LOG')
 
-                sh "git diff --stat ${Settings.Commit} ${Settings.PrevCommit} > GIT_DIFF"
+                sh "git diff --stat ${scmVars.GIT_COMMIT} ${scmVars.GIT_PREVIOUS_COMMIT} > GIT_DIFF"
                 gitDiff = readFile('GIT_DIFF')
         }