icecheng/freeleaps-ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(executeFreeleapsPipeline): standardize logging and update dependencies manager naming

Browse Source 
Signed-off-by: 孙振宇 <>
This commit is contained in:
孙振宇 2025-01-22 16:15:31 +08:00
parent a35a3ee8e1
commit 8c544961b0
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
first-class-pipeline/tests/Jenkinsfile vendored
View File

@ -4,7 +4,7 @@ executeFreeleapsPipeline {
serviceGitBranch = 'master' serviceGitBranch = 'master'
serviceGitRepo = "https://freeleaps@dev.azure.com/freeleaps/magicleaps/_git/magicleaps" serviceGitRepo = "https://freeleaps@dev.azure.com/freeleaps/magicleaps/_git/magicleaps"
environmentSlug = 'alpha' environmentSlug = 'alpha'
dependenciesManager = 'PIP' dependenciesManager = 'pip'
pipRequirementsFile = 'requirements.txt' pipRequirementsFile = 'requirements.txt'
buildCacheEnabled = true buildCacheEnabled = true
} }

9
first-class-pipeline/vars/executeFreeleapsPipeline.groovy
View File

@ -35,7 +35,7 @@ def call(body) {
def enabled = configurations.commitMessageLintEnabled def enabled = configurations.commitMessageLintEnabled
if (enabled != null && enabled == "true") { if (enabled != null && enabled == "true") {
print("Commit Linting is enabled") log.info "Commit Line has enabled"
} }
} }
} }
@ -46,7 +46,7 @@ def call(body) {
script { script {
def buildAgentImage = configurations.buildAgentImage def buildAgentImage = configurations.buildAgentImage
if (buildAgentImage == null || buildAgentImage.isEmpty()) { 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) def language = ServiceLanguage.parse(configurations.serviceLang)
switch(language) { switch(language) {
@ -60,7 +60,7 @@ def call(body) {
error("Unknown service language") error("Unknown service language")
} }
echo "Using ${buildAgentImage} as build agent image" log.info "Using ${buildAgentImage} as build agent image"
env.buildAgentImage = buildAgentImage env.buildAgentImage = buildAgentImage
} }
} }
@ -98,9 +98,6 @@ spec:
def language = ServiceLanguage.parse(configurations.serviceLang) def language = ServiceLanguage.parse(configurations.serviceLang)
def depManager = DependenciesManager.parse(configurations.dependenciesManager) def depManager = DependenciesManager.parse(configurations.dependenciesManager)
if (depManager == DependenciesManager.UNKNOWN) {
error("Unknown dependencies manager")
}
def dependenciesResolver = new DependenciesResolver(this, language) def dependenciesResolver = new DependenciesResolver(this, language)
dependenciesResolver.useManager(depManager) dependenciesResolver.useManager(depManager)

13
first-class-pipeline/vars/log.groovy Normal file
View File

@ -0,0 +1,13 @@
#!groovy
def info(message) {
echo "[INFO] ${message}"
}
def warn(message) {
echo "[WARN] ${message}"
}
def error(message) {
echo "[ERROR] ${message}"
}