Use latest frontend-testing image: add condition for ref-updated(tagging)
PRODX-30342
Change-Id: I525ad9b56deb040cd3f8ec35ac4cc0b7fe7c3e51
diff --git a/src/com/mirantis/mk/KaasUtils.groovy b/src/com/mirantis/mk/KaasUtils.groovy
index d68b591..e274d58 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -1430,11 +1430,18 @@
*/
def getImageTag(version, isChanged, imageName) {
def common = new com.mirantis.mk.Common()
- def latestTag = env.GERRIT_BRANCH ? env.GERRIT_BRANCH : env.GERRIT_REFSPEC ? env.GERRIT_REFSPEC : 'master'
+ def latestTag = ''
if (!(env.GERRIT_EVENT_TYPE in ['change-merged', 'ref-updated']) && isChanged) {
latestTag = version
- } else if (latestTag != 'master') {
- latestTag = latestTag.replaceAll('/', '_')
+ } else {
+ if (env.GERRIT_EVENT_TYPE == 'ref-updated') {
+ latestTag = env.GERRIT_REFNAME.replace('refs/tags/v', '').trim()
+ } else {
+ latestTag = env.GERRIT_BRANCH ? env.GERRIT_BRANCH : env.GERRIT_REFSPEC ? env.GERRIT_REFSPEC : 'master'
+ if (latestTag != 'master') {
+ latestTag = latestTag.replaceAll('/', '_')
+ }
+ }
}
common.infoMsg("${imageName} image will use tag '${latestTag}'")
return latestTag