commit a4d484af9fee27abb19b838322ecf3916d929d95
author azvyagintsev <azvyagintsev@mirantis.com> Wed Jan 04 22:41:56 2023 +0200
committer azvyagintsev <azvyagintsev@mirantis.com> Thu Jan 05 00:13:05 2023 +0200
tree 612c0f45065f3bd62ce84cb744726b25c5bd82aa
parent 883f10ff362a66c3e2aad09ccc057046b601dd0e

add verb. to updateReleaseMetadata

PRODX-29447

Change-Id: I727c628ad4d89a51f30d02b3e336f26ca176d1fc

src/com/mirantis/mk/ReleaseWorkflow.groovy

diff --git a/src/com/mirantis/mk/ReleaseWorkflow.groovy b/src/com/mirantis/mk/ReleaseWorkflow.groovy
index f7c7c6c..63a3675 100644
--- a/src/com/mirantis/mk/ReleaseWorkflow.groovy
+++ b/src/com/mirantis/mk/ReleaseWorkflow.groovy
@@ -110,6 +110,7 @@
     String changeAuthorName     = params.get('crAuthorName', 'MCP-CI')
     String changeAuthorEmail    = params.get('crAuthorEmail', 'mcp-ci-jenkins@ci.mcp.mirantis.net')
     Boolean valuesFromFile      = params.get('valuesFromFile', false)
+    Boolean catMetadataLog       = params.get('catMetadataLog', false)
 
     def cred = common.getCredentials(gitCredentialsId, 'key')
     String gerritUser = cred.username
@@ -166,12 +167,18 @@
                     try {
                         sh "metadata-app --path /workspace/metadata update --create --key '${keyArr[i]}' ${valueExpression}"
                         checkResult = sh(script: "metadata-app --path /workspace/metadata validate --structure", returnStatus: true)
+                        def MetadataLogFile = readFile("metadata.log")
+                        if (MetadataLogFile.size() > 0) {
+                            if (catMetadataLog) {
+                                common.errorMsg("Invalid metadata structure, metadata.log file content:\n${MetadataLogFile}")
+                            }
+                        }
                         if (checkResult != 0) {
                             throw new Exception("Invalid metadata structure, see errors in the metadata.log file")
                         }
                     } finally {
-                        if (valuesFromFile){
-                            sh "rm ${tmpFile}"
+                        if (valuesFromFile) {
+                            sh "rm -v ${tmpFile}"
                         }
                     }
                 }