Fix weekly image tags (#1798)

apache · Aug 26, 2024 · 475225a · 475225a
1 parent 38632d2
commit 475225a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
@@ -150,7 +150,7 @@ pipeline {
                     int retries = Integer.parseInt(env.MAX_REGISTRY_RETRIES)
                     String imageTag = getBuiltImageTag()
                     if (isDeployLatestTag()) {
-                        latestTag = getTriggeringProjectName().contains('weekly') ? 'weekly-latest' : 'latest'
+                        latestTag = 'latest'
                         cloud.skopeoCopyRegistryImages(imageTag, getBuiltImageTag(latestTag), retries)
                     }
                 }

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(false)
+                    projectVersion = getProjectVersion()
                     dir(getRepoName()) {
                         githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
                         githubscm.tagRepository(projectVersion)
@@ -281,11 +281,7 @@ String getDeployImageNameSuffix() {
     return params.IMAGE_NAME_SUFFIX
 }
 String getDeployImageTag() {
-    return getBuildBranch() + "-" + getProjectVersionDate()
-}
-
-boolean isDeployLatestTag() {
-    return params.DEPLOY_WITH_LATEST_TAG
+    return getProjectVersion()
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -346,10 +342,6 @@ String getProjectVersionDate() {
     return projectVersionDate.replace('-', '')
 }
 
-String getProjectVersion(boolean keepSnapshotSuffix = true) {
-    def projectVersion = env.PROJECT_VERSION
-    if (keepSnapshotSuffix) {
-        return projectVersion.replace("-SNAPSHOT", "-${getProjectVersionDate()}-SNAPSHOT")
-    }
-    return projectVersion.replace("-SNAPSHOT", "-${getProjectVersionDate()}")
+String getProjectVersion() {
+    return env.PROJECT_VERSION + '-' + getProjectVersionDate()
 }