commit 984c40cf9f5e63d30ff030bb53a16ffb6375a605
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Jul 26 20:29:33 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Thu Jul 26 20:29:33 2018 +0000
tree cdae6347263116880f8d97d5990c2f9d48ccb6e0
parent 663ee82609f7505c458f82a97f12fa374ff7fd93
parent 971eeaf84168c46df835e4a8c15c24723eb7b5f6

Merge "Refactor release-mcp pipelines"

release-mcp-version.groovy

diff --git a/release-mcp-version.groovy b/release-mcp-version.groovy
index 7c30f30..744936f 100644
--- a/release-mcp-version.groovy
+++ b/release-mcp-version.groovy
@@ -56,11 +56,12 @@
   ]
 }
 
-def triggerGitTagJob(gitRepoList, gitCredentials, tag) {
+def triggerGitTagJob(gitRepoList, gitCredentials, tag, source_tag) {
   build job: "tag-git-repos-stable", parameters: [
     [$class: 'StringParameterValue', name: 'GIT_REPO_LIST', value: gitRepoList],
     [$class: 'StringParameterValue', name: 'GIT_CREDENTIALS', value: gitCredentials],
-    [$class: 'StringParameterValue', name: 'TAG', value: tag]
+    [$class: 'StringParameterValue', name: 'TAG', value: tag],
+    [$class: 'StringParameterValue', name: 'SOURCE_TAG', value: source_tag],
   ]
 }
 

tag-git-repos.groovy

diff --git a/tag-git-repos.groovy b/tag-git-repos.groovy
index 550a2a1..68229a6 100644
--- a/tag-git-repos.groovy
+++ b/tag-git-repos.groovy
@@ -6,6 +6,7 @@
  *   GIT_REPO_LIST
  *   GIT_CREDENTIALS
  *   TAG
+ *   SOURCE_TAG initial commit\tag to be tagged with TAG
  *
  */
 
@@ -38,6 +39,11 @@
                 repoName = repoArray[0]
                 repoUrl = repoArray[1]
                 repoCommit = repoArray[2]
+                if (repoCommit.contains('SUBS_SOURCE_REF')) {
+                    common.warningMsg("Replacing SUBS_SOURCE_REF => ${SOURCE_TAG}")
+                    repoCommit.replace('SUBS_SOURCE_REF', SOURCE_TAG
+                        )
+                }
                 gitRepoAddTag(repoUrl, repoName, TAG, GIT_CREDENTIALS, repoCommit)
             }
         } catch (Throwable e) {