From dd62417977648010a72e2433d9fbf9e1ae6685fd Mon Sep 17 00:00:00 2001 From: Julian Arndt Date: Sun, 13 Apr 2025 18:30:11 +0200 Subject: [PATCH] Fix jenkinsfiles so that errors are sent to telegram --- jenkinsfiles/APIFootballUpdater/Jenkinsfile | 4 ++-- jenkinsfiles/LigaCupUpdater/Jenkinsfile | 8 ++++---- jenkinsfiles/SupercupUpdater/Jenkinsfile | 8 ++++---- jenkinsfiles/TippligaUpdater/Jenkinsfile | 19 ++++++++++--------- jenkinsfiles/WTLPokalUpdater/Jenkinsfile | 8 ++++---- jenkinsfiles/WhatsAppReminder/Jenkinsfile | 3 +-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/jenkinsfiles/APIFootballUpdater/Jenkinsfile b/jenkinsfiles/APIFootballUpdater/Jenkinsfile index 371af47..1b1aaf9 100644 --- a/jenkinsfiles/APIFootballUpdater/Jenkinsfile +++ b/jenkinsfiles/APIFootballUpdater/Jenkinsfile @@ -21,8 +21,8 @@ pipeline { ]) { try { sh "java --version" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode APIFootballUpdater --season ${season} --league 1 --configFile Tippliga 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesListGistUpdater --season ${season} --league 1 --configFile Tippliga 2>&1 >> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode APIFootballUpdater --season ${season} --league 1 --configFile Tippliga >> log.txt 2>&1" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesListGistUpdater --season ${season} --league 1 --configFile Tippliga >> log.txt 2>&1" } catch (Exception e) { telegramSendManual("TLW-Database-Tool crashed!") } diff --git a/jenkinsfiles/LigaCupUpdater/Jenkinsfile b/jenkinsfiles/LigaCupUpdater/Jenkinsfile index 60f0912..96c9a4f 100644 --- a/jenkinsfiles/LigaCupUpdater/Jenkinsfile +++ b/jenkinsfiles/LigaCupUpdater/Jenkinsfile @@ -20,10 +20,10 @@ pipeline { "JAVA_HOME=${jdkPath}/jdk-22.0.2" ]) { try { - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 49 --configFile EM-Tippspiel 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 49 --configFile EM-Tippspiel 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 49 --configFile EM-Tippspiel 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesResultsUpdater --season ${season} --league 49 --configFile EM-Tippspiel 2>&1 >> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 49 --configFile EM-Tippspiel >> log.txt 2>&1" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 49 --configFile EM-Tippspiel >> log.txt 2>&1" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 49 --configFile EM-Tippspiel >> log.txt 2>&1" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesResultsUpdater --season ${season} --league 49 --configFile EM-Tippspiel >> log.txt 2>&1" } catch (Exception e) { telegramSendManual("TLW-Database-Tool crashed!") } diff --git a/jenkinsfiles/SupercupUpdater/Jenkinsfile b/jenkinsfiles/SupercupUpdater/Jenkinsfile index da7fad0..1b3dd41 100644 --- a/jenkinsfiles/SupercupUpdater/Jenkinsfile +++ b/jenkinsfiles/SupercupUpdater/Jenkinsfile @@ -20,10 +20,10 @@ pipeline { "JAVA_HOME=${jdkPath}/jdk-22.0.2" ]) { try { - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 45 --configFile Supercup 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 45 --configFile Supercup 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 45 --configFile Supercup 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesResultsUpdater --season ${season} --league 45 --configFile Supercup 2>&1 >> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 45 --configFile Supercup >> log.txt 2>&1" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 45 --configFile Supercup >> log.txt 2>&1" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 45 --configFile Supercup >> log.txt 2>&1" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesResultsUpdater --season ${season} --league 45 --configFile Supercup >> log.txt 2>&1" } catch (Exception e) { telegramSendManual("TLW-Database-Tool crashed!") } diff --git a/jenkinsfiles/TippligaUpdater/Jenkinsfile b/jenkinsfiles/TippligaUpdater/Jenkinsfile index b829e47..403c980 100644 --- a/jenkinsfiles/TippligaUpdater/Jenkinsfile +++ b/jenkinsfiles/TippligaUpdater/Jenkinsfile @@ -20,19 +20,20 @@ pipeline { "JAVA_HOME=${jdkPath}/jdk-22.0.2" ]) { try { - sh "ls build/libs" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 1 --configFile Tippliga 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 1 --configFile Tippliga 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 1 --configFile Tippliga 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesResultsUpdater --season ${season} --league 1 --configFile Tippliga 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 2 --configFile Tippliga 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 2 --configFile Tippliga 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 2 --configFile Tippliga 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesResultsUpdater --season ${season} --league 2 --configFile Tippliga 2>&1 >> log.txt" + sh "touch log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 1 --configFile Tippliga &>> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 1 --configFile Tippliga &>> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 1 --configFile Tippliga &>> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesResultsUpdater --season ${season} --league 1 --configFile Tippliga &>> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 2 --configFile Tippliga &>> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 2 --configFile Tippliga &>> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 2 --configFile Tippliga &>> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesResultsUpdater --season ${season} --league 2 --configFile Tippliga &>> log.txt" } catch (Exception e) { telegramSendManual("TLW-Database-Tool crashed!") } String outputString = readFile 'log.txt' + echo "Output: ${outputString}" if(outputString != "") { ArrayList outputList = outputString.replace("\n\n", "\n").split('\n').toList() outputList = clean(outputList) diff --git a/jenkinsfiles/WTLPokalUpdater/Jenkinsfile b/jenkinsfiles/WTLPokalUpdater/Jenkinsfile index 176b8bd..9bfcde2 100644 --- a/jenkinsfiles/WTLPokalUpdater/Jenkinsfile +++ b/jenkinsfiles/WTLPokalUpdater/Jenkinsfile @@ -20,10 +20,10 @@ pipeline { "JAVA_HOME=${jdkPath}/jdk-22.0.2" ]) { try { - sh "$JAVA_HOME/bin/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_HOME/bin/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_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 48 --configFile WTL-Pokal 2>&1 >> log.txt" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesResultsUpdater --season ${season} --league 48 --configFile WTL-Pokal 2>&1 >> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesUpdaterFootball --season ${season} --league 48 --configFile WTL-Pokal >> log.txt 2>&1" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchdaysUpdater --season ${season} --league 48 --configFile WTL-Pokal >> log.txt 2>&1" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode TeamsUpdater --season ${season} --league 48 --configFile WTL-Pokal >> log.txt 2>&1" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesResultsUpdater --season ${season} --league 48 --configFile WTL-Pokal >> log.txt 2>&1" } catch (Exception e) { telegramSendManual("TLW-Database-Tool crashed!") } diff --git a/jenkinsfiles/WhatsAppReminder/Jenkinsfile b/jenkinsfiles/WhatsAppReminder/Jenkinsfile index 9016e08..481381f 100644 --- a/jenkinsfiles/WhatsAppReminder/Jenkinsfile +++ b/jenkinsfiles/WhatsAppReminder/Jenkinsfile @@ -23,8 +23,7 @@ pipeline { "TLW_WHATSAPP_HOST=https://tlw-whatsapp.codeam.io" ]) { try { - sh "ls build/libs" - sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode WhatsAppNotifier --season ${season} --league 1 --configFile Tippliga 2>&1 >> log.txt" + sh "$JAVA_HOME/bin/java -jar build/libs/tlw-database-tool-1.0.jar --mode WhatsAppNotifier --season ${season} --league 1 --configFile Tippliga >> log.txt 2>&1" } catch (Exception e) { telegramSendManual("TLW-Database-Tool crashed!") }