From cb47b53ac7cd54b300087762983c35bc33705ddf Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Mon, 26 Aug 2024 16:38:49 -0300
Subject: [PATCH] Fix weekly image tags

---
 .ci/jenkins/Jenkinsfile.build-image   |  2 +-
 .ci/jenkins/Jenkinsfile.weekly.deploy | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 22e5f67ef..8a89fb281 100644
--- 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
index fd03c959b..fa762daf0 100644
--- 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)
@@ -212,7 +212,7 @@ void createBuildAndTestStageClosure(String image) {
             buildParams.add(string(name: 'DEPLOY_IMAGE_NAMESPACE', value: getDeployImageNamespace()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_NAME_SUFFIX', value: getDeployImageNameSuffix()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_TAG', value: getDeployImageTag()))
-            buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: isDeployLatestTag()))
+            buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: false))
 
             def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
             if (job.result != 'SUCCESS') {
@@ -281,11 +281,7 @@ String getDeployImageNameSuffix() {
     return params.IMAGE_NAME_SUFFIX
 }
 String getDeployImageTag() {
-    return getProjectVersion(false)
-}
-
-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()
 }