From 54b7e409a0e3ac82b9911a8f103f1937ef60e05a Mon Sep 17 00:00:00 2001
From: Sylvain Tricot <sylvain.tricot@univ-rennes1.fr>
Date: Fri, 29 Nov 2019 13:47:52 +0100
Subject: [PATCH] Work on continuous integration

Add VERBOSE=1 in the make calls in the Jenkinsfile to help debugging
the build jobs in Jenkins
---
 Jenkinsfile | 18 +++++++++++-------
 Makefile    |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e40ebd9..9ba2aa4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,24 +4,28 @@ pipeline {
         stage('Initial setup...') {
             steps {
                 echo 'Create or update the virtual Python environment'
-		sh 'make venv'
+		sh 'make venv VERBOSE=1'
             }
         }
 
         stage('Build the code and generate tests results...') {
             steps {
-                sh '. ./ci_venv/bin/activate && make -C src results'
+                sh '. ./ci_venv/bin/activate && make -C src results VERBOSE=1'
             }
         }
-        stage('Create a setup file and test installation...') {
+        stage('Create a setup file...') {
             steps {
-                sh 'make selfex'
-                sh '. ./ci_venv/bin/activate && ./package/MsSpec*.setup --accept -- -y'
+                sh 'make selfex VERBOSE=1'
+            }
+        }
+        stage('Test installation...') {
+            steps {
+                sh '. ./ci_venv/bin/activate && cd ./package/ && ./MsSpec*.setup --accept -- -y -d'
             }
         }
         stage('Building HTML documentation...') {
             steps {
-                sh '. ./ci_venv/bin/activate && make doc'
+                sh '. ./ci_venv/bin/activate && make doc VERBOSE=1'
             }
         }
         stage('Syncing website...') {
@@ -32,7 +36,7 @@ pipeline {
         stage('Cleaning up...') {
             steps {
                 echo 'Cleaning artifacts...'
-                sh 'make clean'
+                sh 'make clean VERBOSE=1'
             }
         }
 
diff --git a/Makefile b/Makefile
index c916d2a..42c8ff5 100644
--- a/Makefile
+++ b/Makefile
@@ -60,8 +60,8 @@ clean:
 
 
 venv:
-	@virtualenv --python=python3 --system-site-packages ci_venv
-	@. "./ci_venv/bin/activate" && pip install --upgrade pip numpy ase h5py lxml pint terminaltables pycairo sphinx
+	@virtualenv --python=python3 --system-site-packages ci_venv $(SUPPRESS_OUPUT)
+	@. "./ci_venv/bin/activate" && pip install --upgrade pip numpy ase h5py lxml pint terminaltables pycairo sphinx $(SUPPRESS_OUPUT)
 
 doc:
 	@echo "Building pdf and html documentation..."