testing trap

konflux-ci · Nov 1, 2024 · e032884 · e032884
1 parent cbdf855
commit e032884
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/task/prefetch-dependencies-oci-ta/0.1/prefetch-dependencies-oci-ta.yaml b/task/prefetch-dependencies-oci-ta/0.1/prefetch-dependencies-oci-ta.yaml
@@ -354,7 +354,7 @@ spec:
         cachi2 --log-level="$LOG_LEVEL" inject-files /var/workdir/cachi2/output \
           --for-output-dir=/cachi2/output
 
-        trap "cleanup" EXIT
+        trap 'cleanup' EXIT
     - name: create-trusted-artifact
       image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:e0e457b6af10e44ff6b90208a9e69adc863a865e1c062c4cb84bf3846037d74d
       args:

diff --git a/task/prefetch-dependencies/0.1/prefetch-dependencies.yaml b/task/prefetch-dependencies/0.1/prefetch-dependencies.yaml
@@ -269,13 +269,14 @@ spec:
       --for-output-dir=/cachi2/output
 
       cleanup() {
-      # run any needed cleanup commands and retain exit code of last run command
-      rv=$?
-      subscription-manager unregister
-      exit $rv
+        exit_code=$?
+        # run any needed cleanup
+        which subscription-manager
+        subscription-manager unregister
+        exit $1
       }
 
-      trap "cleanup" EXIT
+      trap 'cleanup' EXIT
 
   workspaces:
   - name: source