Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision d2c58be098cf39b38ec405edb67dbfc26914b09c)
+++ Jenkinsfile	(revision 3a9acebc19cbc3650b933c8419e1f9804c56610d)
@@ -116,12 +116,8 @@
 	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,9 +153,5 @@
 		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,16 +215,5 @@
 		]])
 
-	// 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,6 +368,6 @@
 	return update
 
-def output=readFile('result').trim()
-echo "output=$output";
+	def output=readFile('result').trim()
+	echo "output=$output";
 }
 
@@ -402,10 +383,12 @@
 
 	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')
 	}