remove redundant node clean-up code

refs DE-338 The protectedNode() function now handles automatic cleanup before / after a node is used, so much of the code here can be removed. Test Plan: 1. Main build passes, FSC passes [canvas-builds-refspec=81cc926fe89d6efd9f604d0c573630318fb4eb86] Change-Id: Ie21d242aabe9826353f05149abb304a85223cebc Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/263149 Tested-by: Service Cloud Jenkins <[email protected]> Reviewed-by: Kyle Rosenbaum <[email protected]> QA-Review: Aaron Ogata <[email protected]> Product-Review: Aaron Ogata <[email protected]>
flexion · Apr 19, 2021 · b7b9d8c · b7b9d8c
1 parent 9bf1b46
commit b7b9d8c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 42 deletions.
diff --git a/Jenkinsfile.contract-tests b/Jenkinsfile.contract-tests
@@ -21,14 +21,10 @@
 library "canvas-builds-library@${env.CANVAS_BUILDS_REFSPEC}"
 
 def cleanupFn(status) {
-  try {
-    junit "tmp/spec_results/**/*.xml"
+  junit "tmp/spec_results/**/*.xml"
 
-    if(status == 'SUCCESS' && configuration.isChangeMerged()) {
-      sh 'build/new-jenkins/pact/contracts-publish-api.sh'
-    }
-  } finally {
-    sh 'rm -vrf tmp/spec_results'
+  if(status == 'SUCCESS' && configuration.isChangeMerged()) {
+    sh 'build/new-jenkins/pact/contracts-publish-api.sh'
   }
 }
 

diff --git a/Jenkinsfile.js b/Jenkinsfile.js
@@ -53,7 +53,6 @@ def cleanupFn() {
     if(env.TEST_SUITE != 'upload') {
       archiveArtifacts artifacts: 'tmp/**/*.xml'
       junit "tmp/**/*.xml"
-      sh 'find ./tmp -path "*.xml"'
     }
   }
 }

diff --git a/Jenkinsfile.selenium.flakey_spec_catcher b/Jenkinsfile.selenium.flakey_spec_catcher
@@ -172,12 +172,8 @@ def sendSlack(success) {
 }
 
 def cleanupFn(status) {
-  try {
-    if(fsc_status != 'aborted') {
-      sendSlack(status == 'SUCCESS')
-    }
-  } finally {
-    sh 'rm -vrf ./tmp/'
+  if(fsc_status != 'aborted') {
+    sendSlack(status == 'SUCCESS')
   }
 }
 
@@ -267,13 +263,8 @@ pipeline {
                         "FSC_TESTS=${partitions[index].join(',')}",
                         "NODE_NUMBER=$node_number"
                       ]) {
-                        try {
-                          setupNode()
-                          executeFlakeySpecCatcher("node$node_number")
-                        }
-                        finally {
-                          sh 'rm -vrf ./tmp'
-                        }
+                        setupNode()
+                        executeFlakeySpecCatcher("node$node_number")
                       }
                     }
                   }

diff --git a/Jenkinsfile.vendored-gems b/Jenkinsfile.vendored-gems
@@ -21,27 +21,23 @@
 library "canvas-builds-library@${env.CANVAS_BUILDS_REFSPEC}"
 
 def cleanupFn() {
-  try {
-    def htmlFiles
+  def htmlFiles
 
-    sh 'docker cp $(docker ps -f "ancestor"="$PATCHSET_TAG" -q):/usr/src/app/tmp/spec_results/. ./spec_results/'
+  sh 'docker cp $(docker ps -f "ancestor"="$PATCHSET_TAG" -q):/usr/src/app/tmp/spec_results/. ./spec_results/'
 
-    dir ('spec_results') {
-      sh 'mv report.html canvas_i18nliner_results.html'
-      htmlFiles = findFiles glob: '*results.html'
-    }
-
-    publishHTML target: [
-      allowMissing: false,
-      alwaysLinkToLastBuild: false,
-      keepAll: true,
-      reportDir: "spec_results",
-      reportFiles: htmlFiles.join(','),
-      reportName: 'Test Results'
-    ]
-  } finally {
-    sh 'rm -vrf ./spec_results/'
+  dir ('spec_results') {
+    sh 'mv report.html canvas_i18nliner_results.html'
+    htmlFiles = findFiles glob: '*results.html'
   }
+
+  publishHTML target: [
+    allowMissing: false,
+    alwaysLinkToLastBuild: false,
+    keepAll: true,
+    reportDir: "spec_results",
+    reportFiles: htmlFiles.join(','),
+    reportName: 'Test Results'
+  ]
 }
 
 pipeline {

diff --git a/build/new-jenkins/library/vars/setupStage.groovy b/build/new-jenkins/library/vars/setupStage.groovy
@@ -17,9 +17,6 @@
  */
 
 def call() {
-  echo 'Cleaning Workspace From Previous Runs'
-  sh 'ls -A1 | xargs rm -rf'
-  sh 'find .'
   def refspecToCheckout = env.GERRIT_PROJECT == "canvas-lms" ? env.GERRIT_REFSPEC : env.CANVAS_LMS_REFSPEC
   checkoutRepo("canvas-lms", refspecToCheckout, 100)