From d47c9daf4fa235faaa1e7137c353dce5cbfcdaa6 Mon Sep 17 00:00:00 2001
From: Morgan McMillian <morgan@mcmillian.dev>
Date: Tue, 29 Nov 2022 11:19:51 -0800
Subject: [PATCH] move cleanup to start of build stage

---
 Jenkinsfile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 17192ec..8a99659 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,6 +3,9 @@ pipeline {
     environment {
         SNAPCRAFT_STORE_CREDENTIALS = credentials('snapcraft-store-credentials')
     }
+    options {
+        skipDefaultCheckout(true)
+    }
     stages {
         stage('Build snap packages') {
             parallel {
@@ -10,7 +13,9 @@ pipeline {
                     agent { label "snap-arm64" }
                     steps {
                         mattermostSend "ARM64 Snap build started - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
-                        sh "rm *.snap || true"
+                        cleanWs()
+                        // sh "rm *.snap || true"
+                        checkout scm
                         sh "snapcraft"
                     }
                     post {
@@ -22,16 +27,15 @@ pipeline {
                         failure {
                             mattermostSend color: "danger", message: "ARM64 Snap build failure - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
                         }
-                        always {
-                            cleanWs()
-                        }
                     }
                 }
                 stage('Build snap for AMD64') {
                     agent { label "snap-amd64" }
                     steps {
                         mattermostSend "AMD64 Snap build Started - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
-                        sh "rm *.snap || true"
+                        cleanWs()
+                        // sh "rm *.snap || true"
+                        checkout scm
                         sh "snapcraft"
                     }
                     post {
@@ -43,9 +47,6 @@ pipeline {
                         failure {
                             mattermostSend color: "danger", message: "AMD64 Snap build failure - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
                         }
-                        always {
-                            cleanWs()
-                        }
                     }
                 }
             }