From d30ec92bb5c3404d6fc93e043e4b6019b76cd01d Mon Sep 17 00:00:00 2001 From: Julian Arndt Date: Thu, 13 Apr 2023 10:40:35 +0200 Subject: [PATCH] Clean up pipelines --- jenkinsfiles/SupercupUpdater/Jenkinsfile | 44 ++++++------------------ jenkinsfiles/WTLPokalUpdater/Jenkinsfile | 44 ++++++------------------ 2 files changed, 22 insertions(+), 66 deletions(-) diff --git a/jenkinsfiles/SupercupUpdater/Jenkinsfile b/jenkinsfiles/SupercupUpdater/Jenkinsfile index ee89bb2..7fcbca3 100644 --- a/jenkinsfiles/SupercupUpdater/Jenkinsfile +++ b/jenkinsfiles/SupercupUpdater/Jenkinsfile @@ -13,35 +13,15 @@ pipeline { String jdkPath = tool name: 'OpenJDK', type: 'jdk' withCredentials([usernamePassword(credentialsId: 'aws', passwordVariable: 'AWS_SECRET_KEY', usernameVariable: 'AWS_ACCESS_KEY_ID')]) { withEnv(["JAVA_HOME=${jdkPath}/jdk-19.0.2","AWS_SECRET_KEY=${AWS_SECRET_KEY}", "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}"]) { - String outputBuild = "" - String output = "" - String errorOutput = "" - String outputTemp = "" try { - outputTemp = sh returnStdout: true, script: "java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 45 --configFile Supercup 2>&1" - output += outputTemp + sh "java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 45 --configFile Supercup 2>&1 >> log.txt" + sh "java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 45 --configFile Supercup 2>&1 >> log.txt" + sh "java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 45 --configFile Supercup 2>&1 >> log.txt" } catch (Exception e) { - errorOutput += outputTemp + telegramSendManual("TLW-Database-Tool crashed!") } - try { - outputTemp = sh returnStdout: true, script: "java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 45 --configFile Supercup 2>&1" - output += outputTemp - } catch (Exception e) { - errorOutput += outputTemp - } - try { - outputTemp = sh returnStdout: true, script: "java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 45 --configFile Supercup 2>&1" - output += outputTemp - } catch (Exception e) { - errorOutput += outputTemp - } - if(output != "") { - output = clean(output) - output.split('\n').toList().unique().each { - telegramSendManual(it) - } - } - if(errorOutput != "") { + String outputString = readFile 'log.txt' + if(outputString != "") { ArrayList outputList = outputString.replace("\n\n", "\n").split('\n').toList() outputList = clean(outputList) outputList.each { @@ -53,14 +33,12 @@ pipeline { } } } - stage('CleanUp') { - steps { - deleteDir() - } - } } - post { - failure { + post { + always { + deleteDir() + } + failure { telegramSendManual("Build failed!\n${env.BUILD_URL}console") } } diff --git a/jenkinsfiles/WTLPokalUpdater/Jenkinsfile b/jenkinsfiles/WTLPokalUpdater/Jenkinsfile index aaef557..a77f1f6 100644 --- a/jenkinsfiles/WTLPokalUpdater/Jenkinsfile +++ b/jenkinsfiles/WTLPokalUpdater/Jenkinsfile @@ -13,35 +13,15 @@ pipeline { String jdkPath = tool name: 'OpenJDK19', type: 'jdk' withCredentials([usernamePassword(credentialsId: 'aws', passwordVariable: 'AWS_SECRET_KEY', usernameVariable: 'AWS_ACCESS_KEY_ID')]) { withEnv(["JAVA_HOME=${jdkPath}/jdk-19.0.2","AWS_SECRET_KEY=${AWS_SECRET_KEY}", "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}"]) { - String outputBuild = "" - String output = "" - String errorOutput = "" - String outputTemp = "" try { - outputTemp = sh returnStdout: true, script: "java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 48 --configFile WTL-Pokal 2>&1" - output += outputTemp + sh "java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 48 --configFile WTL-Pokal 2>&1 >> log.txt" + sh "java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 48 --configFile WTL-Pokal 2>&1 >> log.txt" + sh "java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 48 --configFile WTL-Pokal 2>&1 >> log.txt" } catch (Exception e) { - errorOutput += outputTemp + telegramSendManual("TLW-Database-Tool crashed!") } - try { - outputTemp = sh returnStdout: true, script: "java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 48 --configFile WTL-Pokal 2>&1" - output += outputTemp - } catch (Exception e) { - errorOutput += outputTemp - } - try { - outputTemp = sh returnStdout: true, script: "java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 48 --configFile WTL-Pokal 2>&1" - output += outputTemp - } catch (Exception e) { - errorOutput += outputTemp - } - if(output != "") { - output = clean(output) - output.split('\n').toList().unique().each { - telegramSendManual(it) - } - } - if(errorOutput != "") { + String outputString = readFile 'log.txt' + if(outputString != "") { ArrayList outputList = outputString.replace("\n\n", "\n").split('\n').toList() outputList = clean(outputList) outputList.each { @@ -53,14 +33,12 @@ pipeline { } } } - stage('CleanUp') { - steps { - deleteDir() - } - } } - post { - failure { + post { + always { + deleteDir() + } + failure { telegramSendManual("Build failed!\n${env.BUILD_URL}console") } }