refactor(executeFreeleapsPipeline): move 'step' block inside 'script' for improved structure in generateComponentStages function
Signed-off-by: 孙振宇 <>
This commit is contained in:
parent
5d290bd698
commit
fb76a7ea2b
@ -48,28 +48,31 @@ def generateComponentStages(component, configurations) {
|
|||||||
]
|
]
|
||||||
) {
|
) {
|
||||||
node("dep-resolver-${component.name}") {
|
node("dep-resolver-${component.name}") {
|
||||||
step {
|
script {
|
||||||
script {
|
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
|
||||||
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
|
if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
|
||||||
if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
|
log.info("Pipeline", "Using ${env.buildAgentImage} as build agent image for dependencies resolving")
|
||||||
log.info("Pipeline", "Using ${env.buildAgentImage} as build agent image for dependencies resolving")
|
def sourceFetcher = new SourceFetcher(this)
|
||||||
def sourceFetcher = new SourceFetcher(this)
|
sourceFetcher.fetch(configurations)
|
||||||
sourceFetcher.fetch(configurations)
|
|
||||||
|
|
||||||
def language = ServiceLanguage.parse(component.language)
|
def language = ServiceLanguage.parse(component.language)
|
||||||
def depManager = DependenciesManager.parse(component.dependenciesManager)
|
def depManager = DependenciesManager.parse(component.dependenciesManager)
|
||||||
|
|
||||||
def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
|
def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
|
||||||
dependenciesResolver.useManager(depManager)
|
dependenciesResolver.useManager(depManager)
|
||||||
|
|
||||||
if (component.buildCacheEnabled) {
|
if (component.buildCacheEnabled) {
|
||||||
dependenciesResolver.enableCachingSupport()
|
dependenciesResolver.enableCachingSupport()
|
||||||
} else {
|
} else {
|
||||||
dependenciesResolver.disableCachingSupport()
|
dependenciesResolver.disableCachingSupport()
|
||||||
}
|
|
||||||
|
|
||||||
dependenciesResolver.resolve(component)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sh """
|
||||||
|
echo "Running dependencies resolver inside the container"
|
||||||
|
${env.workspace}/dependenciesResolver.resolve(${component.name})
|
||||||
|
"""
|
||||||
|
|
||||||
|
// dependenciesResolver.resolve(component)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user