From 5f8c2fe86725ee2ec1a53bb54bd2bf02a5be27b2 Mon Sep 17 00:00:00 2001 From: radtriste Date: Wed, 2 Aug 2023 15:34:59 +0200 Subject: [PATCH] KOGITO-9671 CI: Remove bot account usage --- .ci/jenkins/Jenkinsfile.deploy | 2 +- .ci/jenkins/Jenkinsfile.promote | 4 ++-- .ci/jenkins/scripts/helper.groovy | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy index 668b95406..23f690873 100644 --- a/.ci/jenkins/Jenkinsfile.deploy +++ b/.ci/jenkins/Jenkinsfile.deploy @@ -26,7 +26,7 @@ pipeline { CONTAINER_ENGINE = 'docker' CONTAINER_ENGINE_TLS_OPTIONS = '' - BOT_BRANCH_HASH = "${util.generateHash(10)}" + PR_BRANCH_HASH = "${util.generateHash(10)}" IMAGE_BUILD_PLATFORMS = 'linux/amd64,linux/arm64' } diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote index d02aab283..960797b6c 100644 --- a/.ci/jenkins/Jenkinsfile.promote +++ b/.ci/jenkins/Jenkinsfile.promote @@ -25,7 +25,7 @@ pipeline { CONTAINER_ENGINE = 'podman' CONTAINER_ENGINE_TLS_OPTIONS = '--tls-verify=false' - BOT_BRANCH_HASH = "${util.generateHash(10)}" + PR_BRANCH_HASH = "${util.generateHash(10)}" GITHUB_REPO = "${REPO_NAME}" // for github-release cli } @@ -74,7 +74,7 @@ pipeline { // Tag with `latest` tag if asked for as parameter if (helper.isDeployLatestTag()) { - promoteImage(helper.getImageFullTag(imageName, baseImageParamsPrefix), helper.getImageFullTag(imageName, promoteImageParamsPrefix, 'latest')) + promoteImage(helper.getImageFullTag(imageName, baseImageParamsPrefix), helper.getImageFullTag(imageName, promoteImageParamsPrefix, 'latest')) } } } diff --git a/.ci/jenkins/scripts/helper.groovy b/.ci/jenkins/scripts/helper.groovy index b62bf7493..b242d6b8b 100644 --- a/.ci/jenkins/scripts/helper.groovy +++ b/.ci/jenkins/scripts/helper.groovy @@ -256,7 +256,7 @@ String getGitAuthorCredsID() { } String getPRBranch() { - return "${getProjectVersion()}-${env.BOT_BRANCH_HASH}" + return "${getProjectVersion()}-${env.PR_BRANCH_HASH}" } String getProjectVersion() { @@ -268,7 +268,7 @@ String getNextVersion() { } String getSnapshotBranch() { - return "${getNextVersion()}-${env.BOT_BRANCH_HASH}" + return "${getNextVersion()}-${env.PR_BRANCH_HASH}" } boolean shouldLaunchTests() {