jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-11-28 08:49:44 +02:00
Code Issues Releases Activity

Docker execution - make sure that script is passed (#403)

Browse Source
This commit is contained in:
Oliver Nocon 2018-11-28 10:46:47 +01:00 committed by GitHub
parent 2881877322
commit 90765697aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vars/batsExecuteTests.groovy
View File

@ -70,7 +70,7 @@ void call(Map parameters = [:]) {
} finally {
sh "cat 'TEST-${config.testPackage}.tap'"
if (config.outputFormat == 'junit') {
dockerExecute(dockerImage: config.dockerImage, dockerWorkspace: config.dockerWorkspace, stashContent: config.stashContent) {
dockerExecute(script: script, dockerImage: config.dockerImage, dockerWorkspace: config.dockerWorkspace, stashContent: config.stashContent) {
sh "npm install tap-xunit -g"
sh "cat 'TEST-${config.testPackage}.tap' | tap-xunit --package='${config.testPackage}' > TEST-${config.testPackage}.xml"
}

1
vars/snykExecute.groovy
View File

@ -62,6 +62,7 @@ void call(Map parameters = [:]) {
variable: 'token'
)]) {
dockerExecute(
script: script,
dockerImage: config.dockerImage,
stashContent: config.stashContent,
dockerEnvVars: ['SNYK_TOKEN': token]