This is an automated email from the ASF dual-hosted git repository.
rantunes pushed a commit to branch 10.0.x
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-images.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new d7ab4ae1 Fix weekly image tags (#1797)
d7ab4ae1 is described below
commit d7ab4ae185cea0db82634f3e5f8b2f657b98228b
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Mon Aug 26 17:43:15 2024 -0300
Fix weekly image tags (#1797)
---
.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 22e5f67e..8a89fb28 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 fd03c959..fa762daf 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()
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
