Set 10.0.x-YYYYMMDD image tags on weekly deploy job

apache · Jul 19, 2024 · e502c54 · e502c54
1 parent b34fa2b
commit e502c54
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -126,7 +126,7 @@ pipeline {
         stage('Create and push a new tag') {
             steps {
                 script {
-                    projectVersion = getProjectVersion()
+                    projectVersion = getProjectVersion(false)
                     dir(getRepoName()) {
                         githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
                         githubscm.tagRepository(projectVersion)
@@ -281,7 +281,7 @@ String getDeployImageNameSuffix() {
     return params.IMAGE_NAME_SUFFIX
 }
 String getDeployImageTag() {
-    return getProjectVersion()
+    return getBuildBranch() + "-" + getProjectVersionDate()
 }
 
 boolean isDeployLatestTag() {
@@ -346,6 +346,10 @@ String getProjectVersionDate() {
     return projectVersionDate.replace('-', '')
 }
 
-String getProjectVersion() {
-    return env.PROJECT_VERSION + getProjectVersionDate()
+String getProjectVersion(boolean keepSnapshotSuffix = true) {
+    def projectVersion = env.PROJECT_VERSION
+    if (keepSnapshotSuffix) {
+        return projectVersion.replace("-SNAPSHOT", "-${getProjectVersionDate()}-SNAPSHOT")
+    }
+    return projectVersion.replace("-SNAPSHOT", "-${getProjectVersionDate()}")
 }