wip

task/prefetch-dependencies-oci-ta/0.1/prefetch-dependencies-oci-ta.yaml

@@ -308,7 +308,8 @@ spec:
         - name: WORKSPACE_NETRC_PATH
           value: $(workspaces.netrc.path)
       script: |
-        #!/bin/bash
+        trap 'cleanup_on_exit' EXIT
+
         INPUT=$(cat /shared/rhsm/preprocessed_input)
         export INPUT
 
@@ -368,8 +369,6 @@ spec:
 
         cachi2 --log-level="$LOG_LEVEL" inject-files /var/workdir/cachi2/output \
           --for-output-dir=/cachi2/output
-
-        trap 'cleanup' EXIT
     - name: create-trusted-artifact
       image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:81c4864dae6bb11595f657be887e205262e70086a05ed16ada827fd6391926ac
       args:

task/prefetch-dependencies/0.1/prefetch-dependencies.yaml

@@ -223,6 +223,18 @@ spec:
         name: shared
     script: |
       #!/bin/bash
+      # Function for cleanup on script exit
+      cleanup_on_exit() {
+        echo "Performing cleanup tasks before script exit..."
+
+        # run any needed cleanup
+        rv=$?
+        subscription-manager unregister
+        exit "$rv"
+      }
+
+      trap 'cleanup_on_exit' EXIT
+
       INPUT=$(cat /shared/rhsm/preprocessed_input)
       export INPUT
 
@@ -283,14 +295,7 @@ spec:
       cachi2 --log-level="$LOG_LEVEL" inject-files $(workspaces.source.path)/cachi2/output \
       --for-output-dir=/cachi2/output
 
-      cleanup() {
-        # run any needed cleanup
-        which subscription-manager
-        subscription-manager unregister
-        exit "$1"
-      }
 
-      trap 'cleanup' EXIT
 
   workspaces:
   - name: source