jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-14 11:03:09 +02:00
Code Issues Releases Activity

Consider stage config from custom defaults (#1670)

Browse Source
This commit is contained in:
Daniel Kurzynski 2020-06-16 09:06:37 +02:00 committed by GitHub
parent 7a132206a9
commit 9a30758115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/config/config.go
View File

@ -176,6 +176,7 @@ func (c *Config) GetStepConfig(flagValues map[string]interface{}, paramJSON stri
def.ApplyAliasConfig(parameters, secrets, filters, stageName, stepName, stepAliases)
stepConfig.mixIn(def.General, filters.General)
stepConfig.mixIn(def.Steps[stepName], filters.Steps)
stepConfig.mixIn(def.Stages[stageName], filters.Steps)
// process hook configuration - this is only supported via defaults
if stepConfig.HookConfig == nil {

6
pkg/config/config_test.go
View File

@ -25,7 +25,7 @@ func (errReadCloser) Close() error {
}
func customDefaultsOpenFileMock(name string) (io.ReadCloser, error) {
return ioutil.NopCloser(strings.NewReader("general:\n p0: p0_custom_default")), nil
return ioutil.NopCloser(strings.NewReader("general:\n p0: p0_custom_default\nstages:\n stage1:\n p1: p1_custom_default")), nil
}
func TestReadConfig(t *testing.T) {
@ -114,7 +114,7 @@ steps:
defaults2 := `general:
p2: p2_general_default
px2: px2_general_default
p3: p3_general_default
p3: p3_general_default
`
paramJSON := `{"p6":"p6_param","p7":"p7_param"}`
@ -227,6 +227,7 @@ steps:
assert.NoError(t, err, "Error occurred but no error expected")
assert.Equal(t, "p0_custom_default", stepConfig.Config["p0"])
assert.Equal(t, "p1_custom_default", stepConfig.Config["p1"])
})
@ -240,6 +241,7 @@ steps:
assert.NoError(t, err, "Error occurred but no error expected")
assert.Equal(t, nil, stepConfig.Config["p0"])
assert.Equal(t, nil, stepConfig.Config["p1"])
})