jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-20 05:19:40 +02:00
Code Issues Releases Activity

Improve logging wrt the docker image used for launching piper-go (#1578)

Browse Source 
Co-authored-by: Oliver Nocon <33484802+OliverNocon@users.noreply.github.com>
This commit is contained in:
Marcus Holl 2020-10-01 16:27:50 +02:00 committed by GitHub
parent 911a88bd49
commit 75a35fb35a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vars/piperExecuteBin.groovy
View File

@ -62,7 +62,7 @@ void call(Map parameters = [:], String stepName, String metadataFile, List crede
config.stashNoDefaultExcludes = parameters.stashNoDefaultExcludes
}
dockerWrapper(script, config) {
dockerWrapper(script, stepName, config) {
handleErrorDetails(stepName) {
script.commonPipelineEnvironment.writeToDisk(script)
try {
@ -141,8 +141,9 @@ static String getCustomConfigArg(def script) {
}
// reused in sonarExecuteScan
void dockerWrapper(script, config, body) {
void dockerWrapper(script, stepName, config, body) {
if (config.dockerImage) {
echo "[INFO] executing pipeline step '${stepName}' with docker image '${config.dockerImage}'"
Map dockerExecuteParameters = [:].plus(config)
dockerExecuteParameters.script = script
dockerExecute(dockerExecuteParameters) {

2
vars/sonarExecuteScan.groovy
View File

@ -60,7 +60,7 @@ void call(Map parameters = [:]) {
// load certificates into cacerts file
loadCertificates(customTlsCertificateLinks: stepConfig.customTlsCertificateLinks, verbose: stepConfig.verbose)
// execute step
piperExecuteBin.dockerWrapper(script, config){
piperExecuteBin.dockerWrapper(script, STEP_NAME, config){
if(!fileExists('.git')) utils.unstash('git')
piperExecuteBin.handleErrorDetails(STEP_NAME) {
withSonarQubeEnv(stepConfig.instance) {