commit d9e631d8d1842e097caed91051e02ba995e78104
author Mykyta Karpin <mkarpin@mirantis.com> Mon Jul 27 10:52:59 2020 +0000
committer Gerrit Code Review <mail@domain.com> Mon Jul 27 10:52:59 2020 +0000
tree d1d17681749f3da4c21e2f52b8eb11387ed32bf2
parent cb5ffca855cd99fd6a5ef2b842f5af5fbb3a7ad9
parent e2ccc1aee38e21deea5dc5a7b91e65638a383ef0

Merge "Switch to artifact-metadata-app docker image"

src/com/mirantis/mk/ReleaseWorkflow.groovy

diff --git a/src/com/mirantis/mk/ReleaseWorkflow.groovy b/src/com/mirantis/mk/ReleaseWorkflow.groovy
index 670dcfa..a531d48 100644
--- a/src/com/mirantis/mk/ReleaseWorkflow.groovy
+++ b/src/com/mirantis/mk/ReleaseWorkflow.groovy
@@ -40,7 +40,7 @@
  *
  * @param key metadata key
  * @param params map with expected parameters:
- *    - toxDockerImage
+ *    - appDockerImage
  *    - outputFormat
  *    - repoDir
  */
@@ -50,9 +50,9 @@
 
     String result
     // Get params
-    String toxDockerImage   = params.get('toxDockerImage', 'alexz0kh/toxhotfix:2')
-    String outputFormat     = params.get('outputFormat', 'json')
-    String repoDir          = common.getAbsolutePath(params.get('repoDir', 'artifact-metadata'))
+    String appDockerImage = params.get('appDockerImage', 'docker-dev-kaas-local.docker.mirantis.net/mirantis/cicd/artifact-metadata-app:latest')
+    String outputFormat   = params.get('outputFormat', 'json')
+    String repoDir        = common.getAbsolutePath(params.get('repoDir', 'artifact-metadata'))
 
     String opts = ''
     if (outputFormat && !outputFormat.isEmpty()) {
@@ -61,8 +61,8 @@
 
     checkoutReleaseMetadataRepo(params)
 
-    docker.image(toxDockerImage).inside("--volume ${repoDir}:/workspace") {
-        result = sh(script: "cd /workspace && tox -qq -e metadata -- ${opts} get --key ${key}", returnStdout: true).trim()
+    docker.image(appDockerImage).inside("--volume ${repoDir}:/workspace") {
+        result = sh(script: "metadata-app --path /workspace/metadata ${opts} get --key ${key}", returnStdout: true).trim()
     }
     common.infoMsg("""
     Release metadata key ${key} has value:
@@ -99,7 +99,7 @@
     String gitCredentialsId     = params.get('metadataCredentialsId', 'mcp-ci-gerrit')
     String metadataRepoUrl      = params.get('metadataGitRepoUrl', "ssh://${gitCredentialsId}@gerrit.mcp.mirantis.net:29418/mcp/artifact-metadata")
     String metadataGerritBranch = params.get('metadataGitRepoBranch', 'master')
-    String toxDockerImage       = params.get('toxDockerImage', 'alexz0kh/toxhotfix:2')
+    String appDockerImage       = params.get('appDockerImage', 'docker-dev-kaas-local.docker.mirantis.net/mirantis/cicd/artifact-metadata-app:latest')
     String repoDir              = common.getAbsolutePath(params.get('repoDir', 'artifact-metadata'))
     String comment              = params.get('comment', '')
     String crTopic              = params.get('crTopic', '')
@@ -114,7 +114,6 @@
     String gerritPort = metadataRepoUrl.tokenize(':')[-1].tokenize('/')[0]
     String workspace = common.getWorkspace()
     String venvDir = "${workspace}/gitreview-venv"
-    String metadataDir = "${repoDir}/metadata"
     String ChangeId
     String commitMessage
     String gitRemote
@@ -148,7 +147,7 @@
         def keyArr = key.split(';')
         def valueArr = value.split(';')
         if (keyArr.size() == valueArr.size()) {
-            docker.image(toxDockerImage).inside("--volume ${repoDir}:/workspace") {
+            docker.image(appDockerImage).inside("--volume ${repoDir}:/workspace") {
                 for (i in 0..keyArr.size()-1) {
                     def valueExpression = "--value '${valueArr[i]}'"
                     def tmpFile
@@ -161,7 +160,7 @@
                         valueExpression = "--file ${tmpFile}"
                     }
                     try {
-                        sh "cd /workspace && tox -qq -e metadata -- update --create --key '${keyArr[i]}' ${valueExpression}"
+                        sh "metadata-app --path /workspace/metadata update --create --key '${keyArr[i]}' ${valueExpression}"
                     } finally {
                         if (valuesFromFile){
                             sh "rm ${tmpFile}"