refactor(executeFreeleapsPipeline): standardize logging and update dependencies manager naming
Signed-off-by: 孙振宇 <>
This commit is contained in:
parent
a35a3ee8e1
commit
8c544961b0
2
first-class-pipeline/tests/Jenkinsfile
vendored
2
first-class-pipeline/tests/Jenkinsfile
vendored
@ -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
|
||||
}
|
||||
@ -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)
|
||||
|
||||
13
first-class-pipeline/vars/log.groovy
Normal file
13
first-class-pipeline/vars/log.groovy
Normal file
@ -0,0 +1,13 @@
|
||||
#!groovy
|
||||
|
||||
def info(message) {
|
||||
echo "[INFO] ${message}"
|
||||
}
|
||||
|
||||
def warn(message) {
|
||||
echo "[WARN] ${message}"
|
||||
}
|
||||
|
||||
def error(message) {
|
||||
echo "[ERROR] ${message}"
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user