Aggiunta variabile mancante allo script di installazione

link-it · Sep 2, 2019 · c400054 · c400054
1 parent f71f453
commit c400054
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,18 +1,9 @@
 pipeline {
   agent any
   stages {
-    stage('cleanup') {
-      steps {
-        sh 'sh ./src/main/resources/scripts/jenkins.cleanup.sh'
-      }
-    }
-    stage('compile') {
-      steps {
-        sh '/var/lib/jenkins/tools/hudson.tasks.Maven_MavenInstallation/Maven_3.6.1/bin/mvn clean install -Denv=installer_template'
-      }
-    }
     stage('build') {
       steps {
+	sh '/var/lib/jenkins/tools/hudson.tasks.Maven_MavenInstallation/Maven_3.6.1/bin/mvn clean install -Denv=installer_template'
 	sh 'sh ./src/main/resources/scripts/jenkins.build.sh'
       }
       post {
@@ -23,9 +14,10 @@ pipeline {
     }
     stage('install') {
       steps {
+	sh 'sh ./src/main/resources/scripts/jenkins.cleanup.sh'
         sh 'sh ./src/main/resources/scripts/jenkins.install.sh'
         sh 'sudo systemctl start wildfly@govpay'
-	sh 'sh ./src/main/resources/scripts/jenkins-checkgp.sh'
+	sh 'sh ./src/main/resources/scripts/jenkins.checkgp.sh'
       }
     }
     stage('test') {

diff --git a/...main/resources/scripts/jenkins-checkgp.sh → ...main/resources/scripts/jenkins.checkgp.sh b/...main/resources/scripts/jenkins-checkgp.sh → ...main/resources/scripts/jenkins.checkgp.sh
diff --git a/src/main/resources/scripts/jenkins.install.sh b/src/main/resources/scripts/jenkins.install.sh
@@ -1,4 +1,10 @@
 export JAVA_HOME=/opt/jdk1.8.0_191/
+GOVPAY_VERSION=$(mvn -q \\
+    -Dexec.executable=echo \\
+    -Dexec.args=\'${project.version}\' \\
+    --non-recursive \\
+    exec:exec)
+
 
 #####
 ## ESECUZIONE INSTALLER
@@ -45,7 +51,6 @@ sh install.sh text-auto
 #####
 
 echo "Creazione del database..."
-sudo -u postgres dropdb --if-exists govpay
 sudo -u postgres createdb govpay -O govpay
 psql govpay govpay < dist/sql/gov_pay.sql