From eb9ae49e830d1146e4038d352e37eb5bb062d82f Mon Sep 17 00:00:00 2001 From: Rodrigo Antunes Date: Wed, 24 Jul 2024 14:41:28 -0300 Subject: [PATCH] Adjust release pipelines for the Apache 10 release (#1789) --- .ci/jenkins/Jenkinsfile.build-image | 2 +- .ci/jenkins/Jenkinsfile.deploy | 1 - .ci/jenkins/dsl/jobs.groovy | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image index 5782b0cf9..2a9407b59 100644 --- a/.ci/jenkins/Jenkinsfile.build-image +++ b/.ci/jenkins/Jenkinsfile.build-image @@ -459,5 +459,5 @@ String getReleaseSvnCredsId() { } String getImageArtifactReleaseVersion() { - return env.IMAGE_ARTIFACT_RELEASE_VERSION + return params.IMAGE_ARTIFACT_RELEASE_VERSION } diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy index 396fa00dc..b367bd388 100644 --- a/.ci/jenkins/Jenkinsfile.deploy +++ b/.ci/jenkins/Jenkinsfile.deploy @@ -233,7 +233,6 @@ pipeline { } } } - stage('Finalize') { steps { script { diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 60680558d..61066c664 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -152,8 +152,8 @@ void setupDeployJob(JobType jobType) { stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Optional. If artifacts\' version is different from PROJECT_VERSION.') if (jobType == JobType.RELEASE) { stringParam('QUARKUS_PLATFORM_VERSION', '', 'Allow to override the Quarkus Platform version') - stringParam('GIT_TAG_NAME', '', 'Git tag to be created') } + stringParam('GIT_TAG_NAME', '', 'Optional if not RELEASE. Tag to be created in the repository') stringParam('KOGITO_PR_BRANCH', '', 'PR branch name') booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.') @@ -217,7 +217,7 @@ void setupBuildImageJob(JobType jobType) { stringParam('DEPLOY_IMAGE_TAG', '', 'Image tag to use to deploy images') booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag') booleanParam('EXPORT_AND_GPG_SIGN_IMAGE', jobType == JobType.RELEASE, 'Set to true if should images be exported and signed.') - stringParam('IMAGE_ARTIFACT_RELEASE_VERSION', '', 'Set the release version to be attached to the images artifacts names') + stringParam('IMAGE_ARTIFACT_RELEASE_VERSION', '', 'Optional if not RELEASE. Set the release version to be attached to the images artifacts names') } } }