Skip to content

Commit 36cece5

Browse files
set pruneDeadBranches to false when without discarder (#1020)
Co-authored-by: jackyu <jackyu@yunify.com>
1 parent 520ede6 commit 36cece5

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

pkg/client/devops/jenkins/pipeline_internal.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -434,13 +434,15 @@ func createMultiBranchPipelineConfigXml(projectName string, pipeline *devopsv1al
434434
appendMultiBranchJobTriggerToEtree(properties, pipeline.MultiBranchJobTrigger)
435435
}
436436

437+
discarder := project.CreateElement("orphanedItemStrategy")
438+
discarder.CreateAttr("class", "com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy")
439+
discarder.CreateAttr("plugin", "cloudbees-folder")
437440
if pipeline.Discarder != nil {
438-
discarder := project.CreateElement("orphanedItemStrategy")
439-
discarder.CreateAttr("class", "com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy")
440-
discarder.CreateAttr("plugin", "cloudbees-folder")
441441
discarder.CreateElement("pruneDeadBranches").SetText("true")
442442
discarder.CreateElement("daysToKeep").SetText(pipeline.Discarder.DaysToKeep)
443443
discarder.CreateElement("numToKeep").SetText(pipeline.Discarder.NumToKeep)
444+
} else {
445+
discarder.CreateElement("pruneDeadBranches").SetText("false")
444446
}
445447

446448
triggers := project.CreateElement("triggers")
@@ -525,9 +527,11 @@ func parseMultiBranchPipelineConfigXml(config string) (*devopsv1alpha3.MultiBran
525527
}
526528

527529
if discarder := project.SelectElement("orphanedItemStrategy"); discarder != nil {
528-
pipeline.Discarder = &devopsv1alpha3.DiscarderProperty{
529-
DaysToKeep: getElementTextValueOrEmpty(discarder, "daysToKeep"),
530-
NumToKeep: getElementTextValueOrEmpty(discarder, "numToKeep"),
530+
if getElementTextValueOrEmpty(discarder, "pruneDeadBranches") == "true" {
531+
pipeline.Discarder = &devopsv1alpha3.DiscarderProperty{
532+
DaysToKeep: getElementTextValueOrEmpty(discarder, "daysToKeep"),
533+
NumToKeep: getElementTextValueOrEmpty(discarder, "numToKeep"),
534+
}
531535
}
532536
}
533537
if triggers := project.SelectElement("triggers"); triggers != nil {

0 commit comments

Comments
 (0)