Simplify intended stash usage

Signed-off-by: Henri Rosten <[email protected]>

ghaf-pre-merge-pipeline.groovy

@@ -104,7 +104,6 @@ pipeline {
           )
           script {
             env.TARGET_COMMIT = sh(script: 'git rev-parse HEAD', returnStdout: true).trim()
-            env.STASH_REMOTE_PATH = "stash/${env.BUILD_TAG}-commit_${env.TARGET_COMMIT}"
           }
         }
       }
@@ -138,11 +137,7 @@ pipeline {
       steps {
         dir(WORKDIR) {
           script {
-            // Temporarily store the agx build result (image) to 'stash'.
-            // The stash is currently not used, but this is an example showing
-            // how to make the image available for HW-testing, without
-            // permanently archiving the build output to artifact storage.
-            utils.nix_build('.#packages.aarch64-linux.nvidia-jetson-orin-agx-debug', 'stash')
+            utils.nix_build('.#packages.aarch64-linux.nvidia-jetson-orin-agx-debug')
             utils.nix_build('.#packages.aarch64-linux.nvidia-jetson-orin-nx-debug')
             utils.nix_build('.#packages.aarch64-linux.doc')
           }
@@ -151,14 +146,6 @@ pipeline {
     }
   }
   post {
-    always {
-      script {
-        if(utils) {
-          // Remove temporary, stashed build results before exiting the pipeline
-          utils.purge_stash(env.STASH_REMOTE_PATH)
-        }
-      }
-    }
     success {
       script {
         setGitHubPullRequestStatus(

utils.groovy

@@ -31,26 +31,15 @@ def archive_artifacts(String subdir) {
   if (!subdir) {
     println "Warning: skipping archive, subdir not set"
     return
-  } else if (subdir == "stash") {
-    // 'stash' subdir is a special case indicating the artifacts under
-    // that directory are temporary, and will (might) be manually removed
-    // at the end of the pipeline. For that reason, no artifacts link
-    // will be set in the build description.
-    if (!env.STASH_REMOTE_PATH) {
-      println "Warning: skipping archive, STASH_REMOTE_PATH not set"
-      return
-    }
-    run_rclone("copy -L ${subdir}/ :webdav:/${env.STASH_REMOTE_PATH}/")
-  } else {
-    // All other subdirs are archived to env.ARTIFACTS_REMOTE_PATH
-    if (!env.ARTIFACTS_REMOTE_PATH) {
-      println "Warning: skipping archive, ARTIFACTS_REMOTE_PATH not set"
-      return
-    }
-    run_rclone("copy -L ${subdir}/ :webdav:/${env.ARTIFACTS_REMOTE_PATH}/")
-    href="/artifacts/${env.ARTIFACTS_REMOTE_PATH}/"
-    currentBuild.description = "<a href=\"${href}\">📦 Artifacts</a>"
   }
+  // Archive artifacts to env.ARTIFACTS_REMOTE_PATH
+  if (!env.ARTIFACTS_REMOTE_PATH) {
+    println "Warning: skipping archive, ARTIFACTS_REMOTE_PATH not set"
+    return
+  }
+  run_rclone("copy -L ${subdir}/ :webdav:/${env.ARTIFACTS_REMOTE_PATH}/")
+  href="/artifacts/${env.ARTIFACTS_REMOTE_PATH}/"
+  currentBuild.description = "<a href=\"${href}\">📦 Artifacts</a>"
 }
 
 def purge_stash(String remote_path) {