Fix housekeeping.

adoptium · Apr 8, 2024 · 5d216fc · 5d216fc
1 parent a369a87
commit 5d216fc
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/linux/Jenkinsfile b/linux/Jenkinsfile
@@ -204,12 +204,6 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String Versio
               }
               break
        }
-       // Remove copied artifacts
-       for (copiedFile in copiedFiles) {
-           fileToDelete = copiedFile.filePath
-           echo "Deleting file: ${fileToDelete}"
-           deleteDir(path: fileToDelete)
-       }
     }
   } catch (Exception e) {
     error "Error While Checking URL ${Target}: ${e.message}"
@@ -222,21 +216,25 @@ def handleRISCUpload(String Distro) {
     echo "Distro = ${DISTRO}"
     node("dockerBuild&&linux&&x64") {
         tool name: 'jfrog-cli', type: 'jfrog'
+        def copiedFiles = copyArtifacts(filter: '**/build/ospackage/*,**/build/reports/**,**/packageTest/dependencies/deb/*', projectName: env.JOB_NAME, selector: specific(env.BUILD_NUMBER))
         switch(Distro) {
           case "Debian":
-            def copiedFiles = copyArtifacts(filter: '**/build/ospackage/*,**/build/reports/**,**/packageTest/dependencies/deb/*', projectName: env.JOB_NAME, selector: specific(env.BUILD_NUMBER))
             jf 'rt u **/build/ospackage/temurin-*${BUILDARCH}.deb deb/pool/main/t/temurin-${VERSION}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'
             break
           case "RPMS":
-            def copiedFiles = copyArtifacts(filter: '**/build/ospackage/*,**/build/reports/**,**/packageTest/dependencies/deb/*', projectName: env.JOB_NAME, selector: specific(env.BUILD_NUMBER))
             jf 'rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true'
             break
           default:
              echo "Default Case"
-             def copiedFiles = copyArtifacts(filter: '**/build/ospackage/*,**/build/reports/**,**/packageTest/dependencies/deb/*', projectName: env.JOB_NAME, selector: specific(env.BUILD_NUMBER))
              jf 'rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true'
              break
         }
+        // Remove copied artifacts
+        for (copiedFile in copiedFiles) {
+            fileToDelete = copiedFile.filePath
+            echo "Deleting file: ${fileToDelete}"
+            deleteDir(path: fileToDelete)
+        }
     }
 }