jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-12 10:55:20 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Marcus Holl 2018-09-03 08:33:26 +02:00
commit 729f0a7f09
7 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/docs/configuration.md
View File

@ -60,7 +60,7 @@ steps:
newmanCollection: 'myNewmanCollection.file' newmanCollection: 'myNewmanCollection.file'
newmanEnvironment: 'myNewmanEnvironment' newmanEnvironment: 'myNewmanEnvironment'
newmanGlobals: 'myNewmanGlobals' newmanGlobals: 'myNewmanGlobals'
``` ```
## Access to configuration from custom scripts ## Access to configuration from custom scripts

2
test/groovy/ArtifactSetVersionTest.groovy
View File

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

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

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

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

@ -24,7 +24,7 @@ class MavenArtifactVersioningTest extends BasePiperTest{
public RuleChain ruleChain = Rules public RuleChain ruleChain = Rules
.getCommonRules(this) .getCommonRules(this)
.around(jscr) .around(jscr)
.around(new JenkinsReadMavenPomRule(this, 'test/resources/MavenArtifactVersioning')) .around(new JenkinsReadMavenPomRule(this, 'test/resources/versioning/MavenArtifactVersioning'))
@Before @Before
void init() { 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