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

Merge remote-tracking branch 'github/master' into work

Browse Source
This commit is contained in:
Marcus Holl 2018-09-04 10:42:36 +02:00
commit 138a41f02a
9 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/groovy/ArtifactSetVersionTest.groovy
View File

@ -43,7 +43,7 @@ class ArtifactSetVersionTest extends BasePiperTest {
.around(thrown)
.around(jlr)
.around(jscr)
.around(new JenkinsReadMavenPomRule(this, 'test/resources/MavenArtifactVersioning'))
.around(new JenkinsReadMavenPomRule(this, 'test/resources/versioning/MavenArtifactVersioning'))
.around(jwfr)
.around(jder)
.around(jsr)

2
test/groovy/com/sap/piper/versioning/DockerArtifactVersioningTest.groovy
View File

@ -20,7 +20,7 @@ class DockerArtifactVersioningTest extends BasePiperTest{
String passedDir
JenkinsReadFileRule jrfr = new JenkinsReadFileRule(this, 'test/resources/DockerArtifactVersioning')
JenkinsReadFileRule jrfr = new JenkinsReadFileRule(this, 'test/resources/versioning/DockerArtifactVersioning')
JenkinsWriteFileRule jwfr = new JenkinsWriteFileRule(this)
JenkinsLoggingRule jlr = new JenkinsLoggingRule(this)
ExpectedException thrown = ExpectedException.none()

2
test/groovy/com/sap/piper/versioning/MavenArtifactVersioningTest.groovy
View File

@ -27,7 +27,7 @@ class MavenArtifactVersioningTest extends BasePiperTest{
.getCommonRules(this)
.around(new JenkinsReadYamlRule(this))
.around(jscr)
.around(new JenkinsReadMavenPomRule(this, 'test/resources/MavenArtifactVersioning'))
.around(new JenkinsReadMavenPomRule(this, 'test/resources/versioning/MavenArtifactVersioning'))
@Before
void init() {

0
test/resources/DockerArtifactVersioning/Dockerfile → test/resources/versioning/DockerArtifactVersioning/Dockerfile
View File

0
test/resources/MavenArtifactVersioning/pom.xml → test/resources/versioning/MavenArtifactVersioning/pom.xml
View File

0
test/resources/MavenArtifactVersioning/snapshot/pom.xml → test/resources/versioning/MavenArtifactVersioning/snapshot/pom.xml
View File

2
vars/dockerExecute.groovy
View File

@ -24,8 +24,8 @@ void call(Map parameters = [:], body) {
Map config = ConfigurationHelper
.loadStepDefaults(this)
.mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
.mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
.mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
.mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
.mixin(parameters, PARAMETER_KEYS)
.use()
if (isKubernetes() && config.dockerImage) {

2
vars/dockerExecuteOnKubernetes.groovy
View File

@ -25,8 +25,8 @@ void call(Map parameters = [:], body) {
ConfigurationHelper configHelper = ConfigurationHelper
.loadStepDefaults(this)
.mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
.mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName ?: env.STAGE_NAME, STEP_CONFIG_KEYS)
.mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
.mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName ?: env.STAGE_NAME, STEP_CONFIG_KEYS)
.mixin(parameters, PARAMETER_KEYS)
.addIfEmpty('uniqueId', UUID.randomUUID().toString())
Map config = [:]

1
vars/testsPublishResults.groovy
View File

@ -32,6 +32,7 @@ def call(Map parameters = [:]) {
.loadStepDefaults(this)
.mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
.mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
.mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName ?: env.STAGE_NAME, STEP_CONFIG_KEYS)
.mixin(parameters, PARAMETER_KEYS)
.use()