From 9734f1d9f26932c75054356ff1641efd1f60ab3a Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Mon, 13 Jan 2020 17:29:00 +0100
Subject: [PATCH] Use a script block to skip the clean up of the repos if
 resumed.

---
 Jenkinsfile | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c7a7652..3ac777c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -165,28 +165,31 @@ pipeline {
         }
         stage('initialize local repository') {
             steps {
+                script {
+                    if (resume) {
+                        sh '''
+                            echo "REMOVE_LOCAL_REPO: ${REMOVE_LOCAL_REPO}"
+                            echo "CLEANUP_GCUBE_REPO: ${CLEANUP_GCUBE_REPO}"
+                            if [ "$CLEANUP_GCUBE_REPO" = "true" ]; then
+                                 echo "Remove gCube artifacts from local repository"
+                                        rm -rf $MAVEN_LOCAL_REPO/org/gcube
+                            fi
+                            if [ "$REMOVE_LOCAL_REPO" = "true" ]; then
+                                 echo "Create a fresh local repository"
+                                 rm -rf $MAVEN_LOCAL_REPO
+                                 mkdir -p $MAVEN_LOCAL_REPO
+                            fi                                                                   
+                        '''
+                    }
+                }
                 sh '''
-                		echo "RESUME_FROM: ${RESUME_FROM}"
-                		if [ -z "$RESUME_FROM" ]; then
-	                        echo "REMOVE_LOCAL_REPO: ${REMOVE_LOCAL_REPO}"
-	                        echo "CLEANUP_GCUBE_REPO: ${CLEANUP_GCUBE_REPO}"
-	                        if [ "$CLEANUP_GCUBE_REPO" = "true" ]; then
-	                            echo "Remove gCube artifacts from local repository"
-	                            rm -rf $MAVEN_LOCAL_REPO/org/gcube
-	                        fi
-	                        if [ "$REMOVE_LOCAL_REPO" = "true" ]; then
-	                            echo "Create a fresh local repository"
-	                            rm -rf $MAVEN_LOCAL_REPO
-	                            mkdir -p $MAVEN_LOCAL_REPO
-	                        fi
-	                    fi    
-                        mv "${AGENT_ROOT_FOLDER}/settings.xml" "${AGENT_ROOT_FOLDER}/settings.${PIPELINE_BUILD_NUMBER}"
-                        cp "${AGENT_ROOT_FOLDER}/${MAVEN_SETTINGS_FILE}" "${AGENT_ROOT_FOLDER}/settings.xml"
-                        echo "Done with local repository and settings"
-
+	                mv "${AGENT_ROOT_FOLDER}/settings.xml" "${AGENT_ROOT_FOLDER}/settings.${PIPELINE_BUILD_NUMBER}"
+    	            cp "${AGENT_ROOT_FOLDER}/${MAVEN_SETTINGS_FILE}" "${AGENT_ROOT_FOLDER}/settings.xml"
+        	        echo "Done with local repository and settings"
                 '''
             }
         }
+
         // the maven-parent needs to be built (once) at each execution
         stage('build maven-parent') {
             steps {