From f7d7cf02760d4ce6a2f3cd649d4572091eae9aa2 Mon Sep 17 00:00:00 2001
From: Meng JiaFeng <jiafeng.meng@merico.dev>
Date: Tue, 29 Nov 2022 20:22:48 +0800
Subject: [PATCH] fix: jenkins add options for config

Signed-off-by: Meng JiaFeng <jiafeng.meng@merico.dev>
---
 internal/pkg/configmanager/pipelineDefault.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/internal/pkg/configmanager/pipelineDefault.go b/internal/pkg/configmanager/pipelineDefault.go
index ac4d6b571..c2826caff 100644
--- a/internal/pkg/configmanager/pipelineDefault.go
+++ b/internal/pkg/configmanager/pipelineDefault.go
@@ -33,13 +33,24 @@ var (
 	}
 	jenkinsGeneral = pipelineOption{
 		defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/ci-template/main/jenkins-pipeline/general/Jenkinsfile",
-		optionGeneratorFunc:   pipelineGeneralGenerator,
+		optionGeneratorFunc:   jenkinsGenerator,
 	}
 	argocdApp = pipelineOption{
 		optionGeneratorFunc: pipelineArgocdAppGenerator,
 	}
 )
 
+// jenkinsGenerator generate jenkins pipeline config
+func jenkinsGenerator(options RawOptions, app *app) RawOptions {
+	newOptions := pipelineGeneralGenerator(options, app)
+	// extract jenkins config from options
+	jenkinsOptions, exist := options["jenkins"]
+	if exist {
+		newOptions["jenkins"] = jenkinsOptions
+	}
+	return newOptions
+}
+
 // pipelineGeneralGenerator generate pipeline general options from RawOptions
 func pipelineGeneralGenerator(options RawOptions, app *app) RawOptions {
 	if app.Spec != nil {