jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-03-05 15:15:44 +02:00
Code Issues Releases Activity

Avoid having the same string literal for the neo log folder three times

Browse Source
This commit is contained in:
Marcus Holl 2019-03-29 16:23:36 +01:00
parent f9047bc37a
commit 48c96a5a31
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vars/neoDeploy.groovy
View File

@ -196,9 +196,11 @@ void call(parameters = [:]) {
private deploy(script, utils, Map configuration, NeoCommandHelper neoCommandHelper, dockerImage, DeployMode deployMode) {
String logFolder = 'logs/neo'
try {
sh "mkdir -p logs/neo"
withEnv(["neo_logging_location=${pwd()}/logs/neo"]) {
sh "mkdir -p ${logFolder}"
withEnv(["neo_logging_location=${pwd()}/${logFolder}"]) {
if (deployMode.isWarDeployment()) {
ConfigurationHelper.newInstance(this, configuration).withPropertyInValues('warAction', WarAction.stringValues())
WarAction warAction = WarAction.fromString(configuration.warAction)
@ -238,7 +240,7 @@ private deploy(script, utils, Map configuration, NeoCommandHelper neoCommandHelp
echo "Error while deploying to SAP Cloud Platform. Here are the neo.sh logs:"
try {
sh "cat logs/neo/*"
sh "cat ${logFolder}/*"
} catch(Exception e) {
echo "Unable to provide the logs."
ex.addSuppressed(e)