Skip to content

fix: jenkins add options for config #1271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2022
Merged

fix: jenkins add options for config #1271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion internal/pkg/configmanager/pipelineDefault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down