From 8c544961b07d571efcd4075fec76d54475e4a1a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=8C=AF=E5=AE=87?= <> Date: Wed, 22 Jan 2025 16:15:31 +0800 Subject: [PATCH] refactor(executeFreeleapsPipeline): standardize logging and update dependencies manager naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙振宇 <> --- first-class-pipeline/tests/Jenkinsfile | 2 +- .../vars/executeFreeleapsPipeline.groovy | 9 +++------ first-class-pipeline/vars/log.groovy | 13 +++++++++++++ 3 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 first-class-pipeline/vars/log.groovy diff --git a/first-class-pipeline/tests/Jenkinsfile b/first-class-pipeline/tests/Jenkinsfile index d0bcb92e..62b71b5a 100644 --- a/first-class-pipeline/tests/Jenkinsfile +++ b/first-class-pipeline/tests/Jenkinsfile @@ -4,7 +4,7 @@ executeFreeleapsPipeline { serviceGitBranch = 'master' serviceGitRepo = "https://freeleaps@dev.azure.com/freeleaps/magicleaps/_git/magicleaps" environmentSlug = 'alpha' - dependenciesManager = 'PIP' + dependenciesManager = 'pip' pipRequirementsFile = 'requirements.txt' buildCacheEnabled = true } \ No newline at end of file diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy index e171c090..9917b031 100644 --- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy +++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy @@ -35,7 +35,7 @@ def call(body) { def enabled = configurations.commitMessageLintEnabled if (enabled != null && enabled == "true") { - print("Commit Linting is enabled") + log.info "Commit Line has enabled" } } } @@ -46,7 +46,7 @@ def call(body) { script { def buildAgentImage = configurations.buildAgentImage if (buildAgentImage == null || buildAgentImage.isEmpty()) { - echo "Not set buildAgentImage, using default build agent image" + log.warn "Not set buildAgentImage, using default build agent image" def language = ServiceLanguage.parse(configurations.serviceLang) switch(language) { @@ -60,7 +60,7 @@ def call(body) { error("Unknown service language") } - echo "Using ${buildAgentImage} as build agent image" + log.info "Using ${buildAgentImage} as build agent image" env.buildAgentImage = buildAgentImage } } @@ -98,9 +98,6 @@ spec: def language = ServiceLanguage.parse(configurations.serviceLang) def depManager = DependenciesManager.parse(configurations.dependenciesManager) - if (depManager == DependenciesManager.UNKNOWN) { - error("Unknown dependencies manager") - } def dependenciesResolver = new DependenciesResolver(this, language) dependenciesResolver.useManager(depManager) diff --git a/first-class-pipeline/vars/log.groovy b/first-class-pipeline/vars/log.groovy new file mode 100644 index 00000000..e62bf90e --- /dev/null +++ b/first-class-pipeline/vars/log.groovy @@ -0,0 +1,13 @@ +#!groovy + +def info(message) { + echo "[INFO] ${message}" +} + +def warn(message) { + echo "[WARN] ${message}" +} + +def error(message) { + echo "[ERROR] ${message}" +} \ No newline at end of file