From 28a90263f61689ede1794408c225ada04f23532d Mon Sep 17 00:00:00 2001
From: cghislai <charlyghislain@gmail.com>
Date: Sat, 27 Nov 2021 18:20:19 +0100
Subject: [PATCH] jenkins: fix keystore conf

---
 Jenkinsfile                    |  2 +-
 tools/jenkins-build-android.sh | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 66cff19..8542a8a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
                container ('flutter') {
                   sshagent(["${params.GIT_CREDENTIAL_ID}"]) {
                   sh 'flutter doctor'
-                  sh 'GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/var/run/ssh/known_hosts.gitea.fteamdev.valuya.be" flutter pub get'
+                  sh 'GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/var/run/ssh/known_hosts.gitea.valuya.com" flutter pub get'
                   sh 'flutter clean'
                   sh 'APP_TITLE="$APP_TITLE"  APP_URI="$APP_URI" APP_COLOR="$APP_COLOR" BUILDMODE="$BUILD_MODEs" ./tools/jenkins-build-android.sh'
                   stash(name: 'outputs', includes: 'build/app/outputs/**')
diff --git a/tools/jenkins-build-android.sh b/tools/jenkins-build-android.sh
index ede13c6..7d54970 100755
--- a/tools/jenkins-build-android.sh
+++ b/tools/jenkins-build-android.sh
@@ -16,11 +16,16 @@ flutter.versionName=
 flutter.versionCode=
 EOF
 
+SECRETS_PATH="/var/run/secrets/gestemps"
+STOREPASS="$(head -n 1 ${SECRETS_PATH}/signing_keystore.store.password)"
+KEYPASS="$(head -n 1 ${SECRETS_PATH}/signing_keystore.key.password)"
+KEYALIAS="$(head -n 1 ${SECRETS_PATH}/signing_keystore.key.alias)"
+
 cat  << EOF > android/key.properties
-storePassword=jenkins.fteamdev
-keyPassword=jenkins.fteamdev
-keyAlias=jenkins.fteamdev
-storeFile=/var/run/secrets/gestemps/signing_keystore.jks
+storePassword=${STOREPASS}
+keyPassword=${KEYPASS}
+keyAlias=${KEYALIAS
+storeFile=${SECRETS_PATH}/signing_keystore.jks
 EOF
 
 pwd