From b9d804b0c02512dcf36f03567d2110768a57158d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=8C=AF=E5=AE=87?= <> Date: Tue, 4 Feb 2025 13:53:11 +0800 Subject: [PATCH] refactor(executeFreeleapsPipeline): move build agent image logic into steps block for improved structure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙振宇 <> --- .../vars/executeFreeleapsPipeline.groovy | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy index 3fe5df23..e0c79f4f 100644 --- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy +++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy @@ -113,26 +113,30 @@ spec: script { configurations.components.each { component -> stage("${component.name} :: Build Agent Setup") { - if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) { - def buildAgentImage = component.buildAgentImage - if (buildAgentImage == null || buildAgentImage.isEmpty()) { - log.warn("Pipeline","Not set buildAgentImage for ${component.name}, using default build agent image") + steps { + script { + if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) { + def buildAgentImage = component.buildAgentImage + if (buildAgentImage == null || buildAgentImage.isEmpty()) { + log.warn("Pipeline","Not set buildAgentImage for ${component.name}, using default build agent image") - def language = ServiceLanguage.parse(configurations.serviceLang) - switch(language) { - case ServiceLanguage.PYTHON: - buildAgentImage = "python:3.10-slim-buster" - break - case ServiceLanguage.JS: - buildAgentImage = "node:lts-alpine" - break - default: - error("Unknown service language") + def language = ServiceLanguage.parse(configurations.serviceLang) + switch(language) { + case ServiceLanguage.PYTHON: + buildAgentImage = "python:3.10-slim-buster" + break + case ServiceLanguage.JS: + buildAgentImage = "node:lts-alpine" + break + default: + error("Unknown service language") + } + + } + log.info("Pipeline","Using ${buildAgentImage} as build agent image for ${component.name}") + env.buildAgentImage = buildAgentImage } - } - log.info("Pipeline","Using ${buildAgentImage} as build agent image for ${component.name}") - env.buildAgentImage = buildAgentImage } }