clean

src/org/qg/StageBucket.groovy

@@ -104,11 +104,15 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
     }
 }
 
-def clean(contextDir, imageTag) {
+def clean_images(imageTag) {
     sh "docker rmi -f \$(docker images -q ${imageTag})"
+}
+
+def clean_dir(contextDir) {
     sh "rm -rf ${contextDir}"
 }
 
 
 
 
+

vars/qgDockerPipeline.groovy

@@ -28,7 +28,15 @@ def call(body) {
     body()
 
     node {
-        try {    
+        try {
+            stage('Clean') {
+                _stage.clean_dir(contextDir)
+            }
+            
+            stage('Checkout') {
+                _stage.checkout(branchName, gitRepo)
+            }
+            
             stage('prepare') {
                 deleteDir()
                 echo "buildType is: ${config.buildType}"
@@ -52,10 +60,6 @@ def call(body) {
                 }
             }
             
-            stage('Checkout') {
-                _stage.checkout(branchName, gitRepo)
-            }
-            
             stage('Build') {
                 switch (config.buildType) {
                     case "java":
@@ -88,11 +92,11 @@ def call(body) {
             }
             
             stage("Clean") {
-                _stage.clean(contextDir, imageTag)
+                _stage.clean_images(imageTag)
             }
         } catch (err) {
             if (imageTag) {
-                _stage.clean(contextDir, imageTag)
+                _stage.clean_images(imageTag)
             }
             currentBuild.result = 'FAILED'
             throw err