diff --git a/jenkinsfiles/APIFootballUpdater/Jenkinsfile b/jenkinsfiles/APIFootballUpdater/Jenkinsfile index 65caed3..504733a 100644 --- a/jenkinsfiles/APIFootballUpdater/Jenkinsfile +++ b/jenkinsfiles/APIFootballUpdater/Jenkinsfile @@ -11,8 +11,14 @@ pipeline { steps { script { 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}"]) { + withCredentials([ + usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_KEY'), + usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'), + usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD') + ]) { + withEnv([ + "JAVA_HOME=${jdkPath}/jdk-19.0.2" + ]) { try { sh "java -jar build/libs/tlw-database-tool-1.0.jar --mode APIFootballUpdater --season ${season} --league 1 --configFile Tippliga 2>&1 >> log.txt" sh "java -jar build/libs/tlw-database-tool-1.0.jar --mode MatchesListGistUpdater --season ${season} --league 1 --configFile Tippliga 2>&1 >> log.txt" diff --git a/jenkinsfiles/CheckGistUpdates/Jenkinsfile b/jenkinsfiles/CheckGistUpdates/Jenkinsfile index a1f3493..c9c608f 100644 --- a/jenkinsfiles/CheckGistUpdates/Jenkinsfile +++ b/jenkinsfiles/CheckGistUpdates/Jenkinsfile @@ -11,8 +11,14 @@ pipeline { steps { script { 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}"]) { + withCredentials([ + usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_KEY'), + usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'), + usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD') + ]) { + withEnv([ + "JAVA_HOME=${jdkPath}/jdk-19.0.2" + ]) { String checksum_tippliga = sh returnStdout: true, script: "java -jar build/libs/tlw-database-tool-1.0.jar --mode PostChecksum --season ${season} --league 1 --configFile Tippliga 2>&1" writeFile file: 'checksum_tippliga.txt', text: checksum_tippliga archiveArtifacts artifacts: 'checksum_tippliga.txt', followSymlinks: false diff --git a/jenkinsfiles/build/Jenkinsfile b/jenkinsfiles/build/Jenkinsfile index 119b783..342a851 100644 --- a/jenkinsfiles/build/Jenkinsfile +++ b/jenkinsfiles/build/Jenkinsfile @@ -11,8 +11,14 @@ pipeline { steps { script { 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}"]) { + withCredentials([ + usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_KEY'), + usernamePassword(credentialsId: 'forum_database', usernameVariable: 'TLW_DATABASE_USERNAME', passwordVariable: 'TLW_DATABASE_PASSWORD'), + usernamePassword(credentialsId: 'forum_user', usernameVariable: 'FORUM_USERNAME', passwordVariable: 'FORUM_PASSWORD') + ]) { + withEnv([ + "JAVA_HOME=${jdkPath}/jdk-19.0.2" + ]) { sh returnStdout: false, script: "./gradlew build -x test" } } diff --git a/src/main/java/de/jeyp91/App.java b/src/main/java/de/jeyp91/App.java index 5dfa7b5..1824925 100644 --- a/src/main/java/de/jeyp91/App.java +++ b/src/main/java/de/jeyp91/App.java @@ -87,8 +87,9 @@ public class App { if(!StatusHolder.getError() && !sql.equals("")) { TippligaSQLConnector con = TippligaSQLConnector.getInstance(); con.executeUpdate(sql); - logger.info(beautifulInfo); } + if(!beautifulInfo.equals("")) + logger.info(beautifulInfo); } private static void initOptions(String[] args) {