From b3942828bed618ff55daaf00b76ce7b5e03996af Mon Sep 17 00:00:00 2001
From: Takiguchi <florian.thierry72@gmail.com>
Date: Thu, 1 Aug 2019 21:06:02 +0200
Subject: [PATCH] Correct the jenkinsfiles.

---
 jenkins/Jenkinsfile-integ | 44 +++++++++++++++++----------------------
 jenkins/Jenkinsfile-prod  |  2 +-
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/jenkins/Jenkinsfile-integ b/jenkins/Jenkinsfile-integ
index e1b8a21..5c9f6c7 100644
--- a/jenkins/Jenkinsfile-integ
+++ b/jenkins/Jenkinsfile-integ
@@ -17,9 +17,7 @@ pipeline {
                     git url:'https://gogs.takiguchi.ovh/florian/codiki-properties.git', branch: 'master', credentialsId: 'a6494064-8130-42fd-9d3d-e7734518c79e'
                 }
                 script {
-                    sh """
-                        cp ./codiki-properties/application-prod.yml ./src/main/resources/application.yml
-                    """
+                    sh 'cp ./codiki-properties/application-prod.yml ./src/main/resources/application.yml'
                 }
             }
         }
@@ -27,21 +25,17 @@ pipeline {
         stage('Documentation generation') {
             steps {
                 script {
-                    sh """
-                        echo 'Génération de la documentation d'utilisation...'
+                    sh '''
+                        echo "Génération de la documentation d'utilisation..."
                         
-                        docPath='../src/main/ts/src/assets/doc/'
-                        cd \$WORKSPACE/doc/ && unoconv codiki_user_manual.odt
-                            && mkdir -p \$docPath
-                            && mv codiki_user_manual.pdf \$docPath
+                        docPath="../src/main/ts/src/assets/doc/"
+                        cd $WORKSPACE/doc/ && unoconv codiki_user_manual.odt \\
+                            && mkdir -p $docPath \\
+                            && mv codiki_user_manual.pdf $docPath \\
                             && cd -
-                        if [ \$? -eq 0 ]
-                        then                        
-                            echo 'Documentation générée avec succès.'
-                        else
-                            echo 'La génération de la documentation s'est terminée en erreur
-                        fi
-                    """
+                            
+                        echo "Documentation générée avec succès."
+                    '''
                 }
             }
         }
@@ -49,13 +43,13 @@ pipeline {
         stage('Angular build') {
             steps {
                 script {
-                    sh """
+                    sh '''
                         echo "Construction de l'application Angular..."
 
-                        cd \$WORKSPACE/src/main/ts && npm install && ng build --configuration=production && cd -
+                        cd $WORKSPACE/src/main/ts && npm install && ng build --configuration=integ && cd -
                         
                         echo "Application générée avec succès."
-                    """
+                    '''
                 }
             }
         }
@@ -74,7 +68,7 @@ pipeline {
                 sshPublisher(
                         publishers: [
                                 sshPublisherDesc(
-                                        configName: 'DebianServer [clubs]',
+                                        configName: 'DebianServer [codiki-integ]',
                                         transfers: [
                                                 sshTransfer(
                                                         cleanRemote: false,
@@ -93,11 +87,11 @@ pipeline {
                                                 sshTransfer(
                                                         cleanRemote: false,
                                                         excludes: '',
-                                                        execCommand: """
-                                                            mv /opt/codiki-2/codiki.jar /opt/codiki-2/bin/codiki.jar
-                                                            sudo /opt/codiki-2/bin/codiki-jenkins.sh
-                                                            sudo service codiki-2 restart
-                                                        """,
+                                                        execCommand: '''
+                                                            mv /opt/codiki-integ/codiki.jar /opt/codiki-integ/bin/codiki.jar
+                                                            sudo /opt/codiki-integ/bin/codiki-jenkins.sh
+                                                            sudo service codiki-integ restart
+                                                        ''',
                                                         execTimeout: 120000,
                                                         flatten: false,
                                                         makeEmptyDirs: false,
diff --git a/jenkins/Jenkinsfile-prod b/jenkins/Jenkinsfile-prod
index 79a682b..810438c 100644
--- a/jenkins/Jenkinsfile-prod
+++ b/jenkins/Jenkinsfile-prod
@@ -84,7 +84,7 @@ pipeline {
                 sshPublisher(
                         publishers: [
                                 sshPublisherDesc(
-                                        configName: 'DebianServer [clubs]',
+                                        configName: 'DebianServer [codiki]',
                                         transfers: [
                                                 sshTransfer(
                                                         cleanRemote: false,