[I/Y-Build] Convert comparator-error message in mail to plain-text too

And simplify the creation of the comparator-error message in the result
mail send to the mailing-list.
Previously the message was still html-code.

Follow-up on
- #2711

Author: HannesWell

JenkinsJobs/Builds/build.jenkinsfile

@@ -275,7 +275,6 @@ spec:
 				script {
 					def buildProps = readBuildProperties("${CJE_ROOT}/buildproperties.properties")
 					env.COMPARATOR_ERRORS_SUBJECT = buildProps.COMPARATOR_ERRORS_SUBJECT
-					env.COMPARATOR_ERRORS_BODY = buildProps.COMPARATOR_ERRORS_BODY
 				}
 			}
 		}
@@ -359,22 +358,25 @@ spec:
 		}
 		success {
 			emailext subject: "${RELEASE_VER} ${BUILD_TYPE}-Build: ${BUILD_IID} ${COMPARATOR_ERRORS_SUBJECT}",
-			body: """\
+			body: ("""\
 			Eclipse downloads:
 			https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_IID}
 
 			Build logs and/or test results (eventually):
 			https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_IID}/testResults.php
-			
-			${COMPARATOR_ERRORS_BODY}Software site repository:
+			""" + (env.COMPARATOR_ERRORS_SUBJECT == '' ? '' : """
+			Check unanticipated comparator messages:
+			https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_IID}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt
+			""") + """
+			Software site repository:
 			https://download.eclipse.org/eclipse/updates/${RELEASE_VER}-${BUILD_TYPE}-builds
 
 			Specific (simple) site repository:
 			https://download.eclipse.org/eclipse/updates/${RELEASE_VER}-${BUILD_TYPE}-builds/${BUILD_IID}
 
 			Equinox downloads:
 			https://download.eclipse.org/equinox/drops/${BUILD_IID}
-			""".stripIndent(), mimeType: 'text/plain',
+			""").stripIndent(), mimeType: 'text/plain',
 			to: "${BUILD.mailingList}", from:'[email protected]'
 		}
 	}

cje-production/mbscripts/mb300_gatherEclipseParts.sh

@@ -282,10 +282,8 @@ then
 
   fn-write-property COMPARATOR_ERRORS "true"
   fn-write-property COMPARATOR_ERRORS_SUBJECT "\"- Comparator Errors Found\""
-  fn-write-property COMPARATOR_ERRORS_BODY "\"Check unanticipated comparator messages:<br>    <a href='https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt'>https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt</a><br><br>\""
 else
   echo -e "DEBUG: comparator logSize of $logSize was not greater than comparatorLogMinimumSize of ${comparatorLogMinimumSize}"
   fn-write-property COMPARATOR_ERRORS_SUBJECT "\"\""
-  fn-write-property COMPARATOR_ERRORS_BODY "\"\""
 fi