From e23d160adf51e7ed8f1f803965792c89667302a6 Mon Sep 17 00:00:00 2001
From: psycho <psychowoife@gmail.com>
Date: Tue, 9 Feb 2021 12:02:50 +0100
Subject: [PATCH] error messages clean up

---
 Jenkinsfile | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9c1c9cb..0e00b0c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,8 +22,7 @@ build_node = 'linux'
 bin_path = 'bin'
 core_count_str = '$((`nproc` + 1))'
 statusCode = 0
-mail_body = "<h1>${JOB_NAME} - Build # ${BUILD_NUMBER} - ${currentBuild.currentResult}:</h1>"
-mail_subject = "${JOB_NAME} - Build # ${BUILD_NUMBER} - ${currentBuild.currentResult}!"
+mail_body = "${JOB_NAME} - Build # ${BUILD_NUMBER}:"
 device_conf = ''
 device = ''
 
@@ -136,7 +135,7 @@ def checkout()
 		if(statusCode != 0)
 		{
 			currentBuild.result = 'FAILURE'
-			throw new Exception("Error checking out configs")
+			throw new Exception('ERROR: failed to check out scripts: ' + script_git)
 		}
 		script = 'test -f ' + config_path + device_conf
 		printDebug(script)
@@ -144,7 +143,7 @@ def checkout()
 		if(statusCode != 0)
 		{
 			currentBuild.result = 'FAILURE'
-			throw new Exception('Error: ' + device_conf + ' not found')
+			throw new Exception('ERROR: DEVICE_CONF: "' + device_conf + '" not found')
 		}
 		script = 'git clone ' + git_link + ' ' + git_folder
 		printDebug(script)
@@ -152,7 +151,7 @@ def checkout()
 		if(statusCode != 0)
 		{
 			currentBuild.result = 'FAILURE'
-			throw new Exception("Error checking out OWRT")
+			throw new Exception('ERROR: failed to check out OWRT: ' + git_link)
 		}
 		script = 'set +x; python ' + scripts_path + 'sftp_test.py -a ' + sftp_host + ' -u ' + sftp_user + ' -p ' + params.SFTP_PASSWD + ' -g ' + git_folder + ' -f ' + scripts_path + known_hosts + ' -l ' + sftp_path + '; set -x'
 		script_print = 'set +x; python ' + scripts_path + 'sftp_test.py -a ' + sftp_host + ' -u ' + sftp_user + ' -p ************' + ' -g ' + git_folder + ' -f ' + scripts_path + known_hosts + ' -l ' + sftp_path + '; set -x'
@@ -162,6 +161,10 @@ def checkout()
 		{
 			isBuildNeeded = true
 		}
+		else
+		{
+			printDebug('build is NOT necessary')
+		}
 	}
 }
 
@@ -175,7 +178,7 @@ def pre_build()
 		if(statusCode != 0)
 		{
 			currentBuild.result = 'FAILURE'
-			throw new Exception("Error patching sources")
+			throw new Exception('ERROR: failed patching sources')
 		}
 		script = 'cd ' + git_folder + '; ./scripts/feeds update -a'
 		printDebug(script)
@@ -183,7 +186,7 @@ def pre_build()
 		if(statusCode != 0)
 		{
 			currentBuild.result = 'FAILURE'
-			throw new Exception("Error updating feeds")
+			throw new Exception('ERROR: failed updating feeds')
 		}
 		script = 'cd ' + git_folder + '; ./scripts/feeds install -a'
 		printDebug(script)
@@ -191,7 +194,7 @@ def pre_build()
 		if(statusCode != 0)
 		{
 			currentBuild.result = 'FAILURE'
-			throw new Exception("Error installing feeds")
+			throw new Exception('ERROR: failed installing feeds')
 		}
 	}
 }
@@ -206,7 +209,7 @@ def build()
 		if(statusCode != 0)
 		{
 			currentBuild.result = 'FAILURE'
-			throw new Exception("Error copying config")
+			throw new Exception('ERROR: failed copying config: ' + device_conf)
 		}
 		script = 'cd ' + git_folder + '; make defconfig; make download; make -j$((`nproc` + 1))'
 		printDebug(script)
@@ -221,7 +224,7 @@ def build()
 			if(statusCode != 0)
 			{
 				currentBuild.result = 'FAILURE'
-				throw new Exception("Error building images")
+				throw new Exception('ERROR: build process failed')
 			}
 		}
 	}
@@ -236,7 +239,7 @@ def build()
 			currentBuild.result = 'UNSTABLE'
 			post_clean = false
 			add2mail("Files not transferred to SFTP!")
-			throw new Exception("Error copying binaries")
+			throw new Exception('WARNING: failed copying binaries')
 		}
 	}
 }
@@ -258,15 +261,11 @@ def post_build()
 		job.save()
 	}
 }
-
-def file_present(String[] file)
-{
-	
-}
 	
 def send_mail()
 {
 	//def body_text = "${JOB_NAME} - Build # ${BUILD_NUMBER} - ${currentBuild.currentResult}:<br>Check console output at ${BUILD_URL} to view the results."
+	add2mail("Overall status: ${currentBuild.result}!")
 	add2mail("Check console output at ${BUILD_URL} to view the results.")
 	emailext body: mail_body, subject: "${JOB_NAME} - Build # ${BUILD_NUMBER} - ${currentBuild.result}!", to: 'psychowoife@gmail.com'
 }