From 758d10b06e3dee6673642d89e66ff77b00a76dd9 Mon Sep 17 00:00:00 2001 From: maxcask Date: Tue, 12 Nov 2024 15:33:38 +0400 Subject: [PATCH] handle new naming strategy for Central Build stage name (#5171) * config helper rename * rename in name provider --------- Co-authored-by: maxcask --- src/com/sap/piper/ConfigurationHelper.groovy | 3 +++ src/com/sap/piper/StageNameProvider.groovy | 17 +++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/com/sap/piper/ConfigurationHelper.groovy b/src/com/sap/piper/ConfigurationHelper.groovy index 2eeaaf0e6..b6b1558dd 100644 --- a/src/com/sap/piper/ConfigurationHelper.groovy +++ b/src/com/sap/piper/ConfigurationHelper.groovy @@ -10,6 +10,9 @@ class ConfigurationHelper implements Serializable { } ConfigurationHelper loadStepDefaults(Map compatibleParameters = [:], String stageName = step.env.STAGE_NAME) { + if (stageName == 'Central Build'){ + stageName = 'Build' + } DefaultValueCache.prepare(step) this.config = ConfigurationLoader.defaultGeneralConfiguration() mixin(ConfigurationLoader.defaultGeneralConfiguration(), null, compatibleParameters) diff --git a/src/com/sap/piper/StageNameProvider.groovy b/src/com/sap/piper/StageNameProvider.groovy index 675387ca4..cd2fa71f0 100644 --- a/src/com/sap/piper/StageNameProvider.groovy +++ b/src/com/sap/piper/StageNameProvider.groovy @@ -3,13 +3,18 @@ package com.sap.piper @Singleton class StageNameProvider implements Serializable { static final long serialVersionUID = 1L + static final String CENTRAL_BUILD = "Central Build"; + static final String BUILD = "Build"; /** Stores a feature toggle for defaulting to technical names in stages */ boolean useTechnicalStageNames = false String getStageName(Script script, Map parameters, Script step) { + String stageName = null if (parameters.stageName in CharSequence) { - return parameters.stageName + stageName = parameters.stageName + stageName = replaceCentralBuild(stageName); + return stageName } if (this.useTechnicalStageNames) { String technicalStageName = getTechnicalStageName(step) @@ -17,7 +22,15 @@ class StageNameProvider implements Serializable { return technicalStageName } } - return script.env.STAGE_NAME + if (stageName == null) { + stageName = script.env.STAGE_NAME + stageName = replaceCentralBuild(stageName); + } + return stageName + } + + private String replaceCentralBuild(String stageName) { + return CENTRAL_BUILD.equals(stageName) ? BUILD : stageName; } static String getTechnicalStageName(Script step) {