diff --git a/Jenkinsfile b/Jenkinsfile index 3b9b439..58fcc1f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -143,8 +143,8 @@ def createNotes(repo_name, repo_url, commit, version, gCube_release_version) { ] ]) - def log_content = get_changelog(repo_name) - appendNotes(extract(log_content, version, gCube_release_version,repo_name)) + def log_content = get_changelog(repo_name,repo_url) + appendNotes(extract(repo_url,log_content, version, gCube_release_version,repo_name)) } @@ -163,10 +163,10 @@ String get_last_commit(repo_name) { * @param repo_name * @return the full content of CHANGELOG.md */ -String get_changelog(repo_name) { +String get_changelog(repo_name,repo_url) { String text; dir(repo_name) { - text = sh(script: 'cat CHANGELOG.md || echo NA', returnStdout: true)?.trim() + text = sh(script: 'cat CHANGELOG.md || echo Missing CHANGELOG.md at ${repo_url}', returnStdout: true)?.trim() } return text; } @@ -180,11 +180,11 @@ String get_changelog(repo_name) { * @params component * @return the notes for then current release */ -String extract(log_content, tag, gCube_release_version, component) { +String extract(repo_url, log_content, tag, gCube_release_version, component) { println "Changelong content: ${log_content}" def matcher = ("${log_content}" =~ /(?is)(\[v$tag]\s+\[r$gCube_release_version\].*?)##\s+\[v.*?\]/) if (!matcher.find()) { - return 'NA' + return "Tags ${tag} / ${gCube_release_version} not found in the CHANGELOG.md at ${repo_url}" } assert matcher[0][1]: "Missing release notes for ${component}" return matcher[0][1]