set pruneDeadBranches to false when without discarder (#1020)

Co-authored-by: jackyu <jackyu@yunify.com>
kubesphere · Nov 6, 2023 · 36cece5 · 36cece5
1 parent 520ede6
commit 36cece5
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/pkg/client/devops/jenkins/pipeline_internal.go b/pkg/client/devops/jenkins/pipeline_internal.go
@@ -434,13 +434,15 @@ func createMultiBranchPipelineConfigXml(projectName string, pipeline *devopsv1al
 		appendMultiBranchJobTriggerToEtree(properties, pipeline.MultiBranchJobTrigger)
 	}
 
+	discarder := project.CreateElement("orphanedItemStrategy")
+	discarder.CreateAttr("class", "com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy")
+	discarder.CreateAttr("plugin", "cloudbees-folder")
 	if pipeline.Discarder != nil {
-		discarder := project.CreateElement("orphanedItemStrategy")
-		discarder.CreateAttr("class", "com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy")
-		discarder.CreateAttr("plugin", "cloudbees-folder")
 		discarder.CreateElement("pruneDeadBranches").SetText("true")
 		discarder.CreateElement("daysToKeep").SetText(pipeline.Discarder.DaysToKeep)
 		discarder.CreateElement("numToKeep").SetText(pipeline.Discarder.NumToKeep)
+	} else {
+		discarder.CreateElement("pruneDeadBranches").SetText("false")
 	}
 
 	triggers := project.CreateElement("triggers")
@@ -525,9 +527,11 @@ func parseMultiBranchPipelineConfigXml(config string) (*devopsv1alpha3.MultiBran
 	}
 
 	if discarder := project.SelectElement("orphanedItemStrategy"); discarder != nil {
-		pipeline.Discarder = &devopsv1alpha3.DiscarderProperty{
-			DaysToKeep: getElementTextValueOrEmpty(discarder, "daysToKeep"),
-			NumToKeep:  getElementTextValueOrEmpty(discarder, "numToKeep"),
+		if getElementTextValueOrEmpty(discarder, "pruneDeadBranches") == "true" {
+			pipeline.Discarder = &devopsv1alpha3.DiscarderProperty{
+				DaysToKeep: getElementTextValueOrEmpty(discarder, "daysToKeep"),
+				NumToKeep:  getElementTextValueOrEmpty(discarder, "numToKeep"),
+			}
 		}
 	}
 	if triggers := project.SelectElement("triggers"); triggers != nil {