refactor(executeFreeleapsPipeline): update component handling to use component names
Signed-off-by: 孙振宇 <>
This commit is contained in:
parent
d6e86827ac
commit
8c827fe1ad
@ -19,8 +19,8 @@ class ChangedComponentsDetector {
|
|||||||
|
|
||||||
changedFiles.each { file ->
|
changedFiles.each { file ->
|
||||||
components.each { component ->
|
components.each { component ->
|
||||||
if (file.startsWith("${component}/")) {
|
if (file.startsWith("${component.name}/")) {
|
||||||
changedComponents.add(component)
|
changedComponents.add(component.name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
13
first-class-pipeline/tests/Jenkinsfile
vendored
13
first-class-pipeline/tests/Jenkinsfile
vendored
@ -8,8 +8,9 @@ executeFreeleapsPipeline {
|
|||||||
serviceGitRepoType = 'monorepo'
|
serviceGitRepoType = 'monorepo'
|
||||||
executeMode = 'on-demand' // on-demand, full
|
executeMode = 'on-demand' // on-demand, full
|
||||||
commitMessageLintEnabled = true
|
commitMessageLintEnabled = true
|
||||||
components {
|
components = [
|
||||||
frontend {
|
{
|
||||||
|
name = 'frontend'
|
||||||
root = 'frontend'
|
root = 'frontend'
|
||||||
language = 'javascript'
|
language = 'javascript'
|
||||||
dependenciesManager = 'npm'
|
dependenciesManager = 'npm'
|
||||||
@ -30,9 +31,9 @@ executeFreeleapsPipeline {
|
|||||||
registryCredentialName = 'first-class-pipeline-dev-secret'
|
registryCredentialName = 'first-class-pipeline-dev-secret'
|
||||||
semanticReleaseEnabled = true
|
semanticReleaseEnabled = true
|
||||||
semanticReleaseBranch = 'master'
|
semanticReleaseBranch = 'master'
|
||||||
}
|
},
|
||||||
|
{
|
||||||
backend {
|
name = 'backend'
|
||||||
root = 'backend'
|
root = 'backend'
|
||||||
language = 'python'
|
language = 'python'
|
||||||
dependenciesManager = 'pip'
|
dependenciesManager = 'pip'
|
||||||
@ -53,5 +54,5 @@ executeFreeleapsPipeline {
|
|||||||
semanticReleaseEnabled = true
|
semanticReleaseEnabled = true
|
||||||
semanticReleaseBranch = 'master'
|
semanticReleaseBranch = 'master'
|
||||||
}
|
}
|
||||||
}
|
]
|
||||||
}
|
}
|
||||||
@ -108,10 +108,10 @@ spec:
|
|||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
configurations.components.each { component ->
|
configurations.components.each { component ->
|
||||||
stage("${component} :: Build Agent Setup") {
|
stage("${component.name} :: Build Agent Setup") {
|
||||||
when {
|
when {
|
||||||
expression {
|
expression {
|
||||||
return env.executeMode == "fully" || env.changedComponents.contains(component)
|
return env.executeMode == "fully" || env.changedComponents.contains(component.name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -119,7 +119,7 @@ spec:
|
|||||||
script {
|
script {
|
||||||
def buildAgentImage = component.buildAgentImage
|
def buildAgentImage = component.buildAgentImage
|
||||||
if (buildAgentImage == null || buildAgentImage.isEmpty()) {
|
if (buildAgentImage == null || buildAgentImage.isEmpty()) {
|
||||||
log.warn "Not set buildAgentImage for ${component}, using default build agent image"
|
log.warn "Not set buildAgentImage for ${component.name}, using default build agent image"
|
||||||
|
|
||||||
def language = ServiceLanguage.parse(configurations.serviceLang)
|
def language = ServiceLanguage.parse(configurations.serviceLang)
|
||||||
switch(language) {
|
switch(language) {
|
||||||
@ -133,17 +133,17 @@ spec:
|
|||||||
error("Unknown service language")
|
error("Unknown service language")
|
||||||
}
|
}
|
||||||
|
|
||||||
log.info "Using ${buildAgentImage} as build agent image for ${component}"
|
log.info "Using ${buildAgentImage} as build agent image for ${component.name}"
|
||||||
env.buildAgentImage = buildAgentImage
|
env.buildAgentImage = buildAgentImage
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage("${component} :: Dependencies Resolving") {
|
stage("${component.name} :: Dependencies Resolving") {
|
||||||
when {
|
when {
|
||||||
expression {
|
expression {
|
||||||
return env.executeMode == "fully" || env.changedComponents.contains(component)
|
return env.executeMode == "fully" || env.changedComponents.contains(component.name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user