set pruneDeadBranches to false when without discarder

kubesphere · Nov 5, 2023 · 10115f8 · 10115f8
1 parent 6887f90
commit 10115f8
Showing 1 changed file with 5 additions and 3 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")