refactor(executeFreeleapsPipeline): change agentContainer to use container function for dep-resolver
Signed-off-by: 孙振宇 <>
This commit is contained in:
parent
62cec3adef
commit
425b7014fa
@ -37,7 +37,6 @@ def generateComponentStages(component, configurations) {
|
||||
stage("${component.name} :: Dependencies Resolving") {
|
||||
podTemplate(
|
||||
label: "dep-resolver-${component.name}",
|
||||
agentContainer: 'dep-resolver',
|
||||
containers: [
|
||||
containerTemplate(
|
||||
name: 'dep-resolver',
|
||||
@ -49,25 +48,27 @@ def generateComponentStages(component, configurations) {
|
||||
]
|
||||
) {
|
||||
node("dep-resolver-${component.name}") {
|
||||
script {
|
||||
if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
|
||||
log.info("Pipeline", "Using ${env.buildAgentImage} as build agent image for dependencies resolving")
|
||||
def sourceFetcher = new SourceFetcher(this)
|
||||
sourceFetcher.fetch(configurations)
|
||||
container('dep-resolver') {
|
||||
script {
|
||||
if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
|
||||
log.info("Pipeline", "Using ${env.buildAgentImage} as build agent image for dependencies resolving")
|
||||
def sourceFetcher = new SourceFetcher(this)
|
||||
sourceFetcher.fetch(configurations)
|
||||
|
||||
def language = ServiceLanguage.parse(component.language)
|
||||
def depManager = DependenciesManager.parse(component.dependenciesManager)
|
||||
def language = ServiceLanguage.parse(component.language)
|
||||
def depManager = DependenciesManager.parse(component.dependenciesManager)
|
||||
|
||||
def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
|
||||
dependenciesResolver.useManager(depManager)
|
||||
|
||||
if (component.buildCacheEnabled) {
|
||||
dependenciesResolver.enableCachingSupport()
|
||||
} else {
|
||||
dependenciesResolver.disableCachingSupport()
|
||||
def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
|
||||
dependenciesResolver.useManager(depManager)
|
||||
|
||||
if (component.buildCacheEnabled) {
|
||||
dependenciesResolver.enableCachingSupport()
|
||||
} else {
|
||||
dependenciesResolver.disableCachingSupport()
|
||||
}
|
||||
|
||||
dependenciesResolver.resolve(component)
|
||||
}
|
||||
|
||||
dependenciesResolver.resolve(component)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user