jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-11-06 09:09:19 +02:00
Code Issues Releases Activity

Include configFile in pipelineConfigAndTests stash (#2424)

Browse Source
This commit is contained in:
Stephan Aßmus
2020-12-01 12:04:27 +01:00
committed by GitHub
parent 518d2fe88d
commit e48b5c588e
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
test/groovy/SetupCommonPipelineEnvironmentTest.groovy
View File

@@ -24,6 +24,7 @@ import static org.junit.Assert.assertThat
class SetupCommonPipelineEnvironmentTest extends BasePiperTest {
def usedConfigFile
def pipelineAndTestStashIncludes
private JenkinsStepRule stepRule = new JenkinsStepRule(this)
private JenkinsWriteFileRule writeFileRule = new JenkinsWriteFileRule(this)
@@ -61,9 +62,24 @@ class SetupCommonPipelineEnvironmentTest extends BasePiperTest {
Yaml yamlParser = new Yaml()
if (parameters.text) {
return yamlParser.load(parameters.text)
} else if(parameters.file) {
if(parameters.file == '.pipeline/default_pipeline_environment.yml') return [default: 'config']
else if (parameters.file == '.pipeline/custom.yml') return [custom: 'myConfig']
} else if (parameters.file) {
switch (parameters.file) {
case '.pipeline/default_pipeline_environment.yml':
return [default: 'config']
case '.pipeline/custom.yml':
return [custom: 'myConfig']
case 'pipeline_config.yml':
usedConfigFile = parameters.file
return [
general: [
productiveBranch: 'main'
],
steps: [
mavenExecute: [
dockerImage: 'my-custom-maven-docker']
]
]
}
} else {
throw new IllegalArgumentException("Key 'text' and 'file' are both missing in map ${m}.")
}
@@ -71,6 +87,10 @@ class SetupCommonPipelineEnvironmentTest extends BasePiperTest {
return yamlParser.load(examplePipelineConfig)
})
helper.registerAllowedMethod("stash", [Map], { Map params ->
pipelineAndTestStashIncludes = params.includes
})
Utils.metaClass.echo = { def m -> }
}
@@ -93,6 +113,7 @@ class SetupCommonPipelineEnvironmentTest extends BasePiperTest {
assertNotNull(nullScript.commonPipelineEnvironment.configuration)
assertEquals('develop', nullScript.commonPipelineEnvironment.configuration.general.productiveBranch)
assertEquals('my-maven-docker', nullScript.commonPipelineEnvironment.configuration.steps.mavenExecute.dockerImage)
assertEquals('.pipeline/**', pipelineAndTestStashIncludes)
}
@Test
@@ -108,6 +129,23 @@ class SetupCommonPipelineEnvironmentTest extends BasePiperTest {
assertNotNull(nullScript.commonPipelineEnvironment.configuration)
assertEquals('develop', nullScript.commonPipelineEnvironment.configuration.general.productiveBranch)
assertEquals('my-maven-docker', nullScript.commonPipelineEnvironment.configuration.steps.mavenExecute.dockerImage)
assertEquals('.pipeline/**', pipelineAndTestStashIncludes)
}
@Test
void testWorksAlsoWithCustomConfig() throws Exception {
helper.registerAllowedMethod("fileExists", [String], { String path ->
return path.endsWith('pipeline_config.yml')
})
stepRule.step.setupCommonPipelineEnvironment(script: nullScript, configFile: 'pipeline_config.yml')
assertEquals('pipeline_config.yml', usedConfigFile)
assertNotNull(nullScript.commonPipelineEnvironment.configuration)
assertEquals('main', nullScript.commonPipelineEnvironment.configuration.general.productiveBranch)
assertEquals('my-custom-maven-docker', nullScript.commonPipelineEnvironment.configuration.steps.mavenExecute.dockerImage)
assertEquals('.pipeline/**, pipeline_config.yml', pipelineAndTestStashIncludes)
}
@Test

6
vars/setupCommonPipelineEnvironment.groovy
View File

@@ -92,7 +92,11 @@ void call(Map parameters = [:]) {
piperLoadGlobalExtensions script: script, customDefaults: parameters.customDefaults, customDefaultsFromFiles: customDefaultsFiles
stash name: 'pipelineConfigAndTests', includes: '.pipeline/**', allowEmpty: true
String stashIncludes = '.pipeline/**'
if (configFile && !configFile.startsWith('.pipeline/')) {
stashIncludes += ", $configFile"
}
stash name: 'pipelineConfigAndTests', includes: stashIncludes, allowEmpty: true
Map config = ConfigurationHelper.newInstance(this)
.loadStepDefaults()