fixing up packaging

zackbradys · Sep 30, 2024 · 22a6be1 · 22a6be1
1 parent fc48dd3
commit 22a6be1
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -128,39 +128,39 @@ jobs:
           time hauler store sync --files rancher-airgap-hauler.yaml
           time hauler store save --filename hauler.tar.zst
           hauler store info
-          ls -laR && rm -rf store hauler.tar.zst
+          ls -laR
 
       - name: Test/Lint Helm
         run: |
           cd hauler/helm
           time hauler store sync --files rancher-airgap-helm.yaml
           time hauler store save --filename helm.tar.zst
           hauler store info
-          ls -laR && rm -rf store helm.tar.zst
+          ls -laR
 
       - name: Test/Lint Cosign
         run: |
           cd hauler/cosign
           time hauler store sync --files rancher-airgap-cosign.yaml
           time hauler store save --filename cosign.tar.zst
           hauler store info
-          ls -laR && rm -rf store cosign.tar.zst
+          ls -laR
 
       - name: Test/Lint RKE2
         run: |
           cd hauler/rke2
           time hauler store sync --files rancher-airgap-rke2.yaml
           time hauler store save --filename rke2.tar.zst
           hauler store info
-          ls -laR && rm -rf store rke2.tar.zst
+          ls -laR
 
       - name: Test/Lint Rancher
         run: |
           cd hauler/rancher
           time hauler store sync --files rancher-airgap-rancher.yaml
           time hauler store save --filename rancher.tar.zst
           hauler store info
-          ls -laR && rm -rf store rancher.tar.zst
+          ls -laR
 
       - name: Test/Lint Rancher Minimal
         run: |
@@ -169,55 +169,55 @@ jobs:
           time hauler store sync --files rancher-airgap-rancher-minimal.yaml
           time hauler store save --filename rancher-minimal.tar.zst
           hauler store info
-          ls -laR && rm -rf store rancher-minimal.tar.zst
+          ls -laR
 
       - name: Test/Lint Longhorn
         run: |
           cd hauler/longhorn
           time hauler store sync --files rancher-airgap-longhorn.yaml
           time hauler store save --filename longhorn.tar.zst
           hauler store info
-          ls -laR && rm -rf store longhorn.tar.zst
+          ls -laR
 
       - name: Test/Lint NeuVector
         run: |
           cd hauler/neuvector
           time hauler store sync --files rancher-airgap-neuvector.yaml
           time hauler store save --filename neuvector.tar.zst
           hauler store info
-          ls -laR && rm -rf store neuvector.tar.zst
+          ls -laR
 
       - name: Test/Lint Harvester
         run: |
           cd hauler/harvester
           time hauler store sync --files rancher-airgap-harvester.yaml
           time hauler store save --filename harvester.tar.zst
           hauler store info
-          ls -laR && rm -rf store harvester.tar.zst
+          ls -laR
 
       - name: Test/Lint Gitea
         run: |
           cd hauler/gitea
           time hauler store sync --files rancher-airgap-gitea.yaml
           time hauler store save --filename gitea.tar.zst
           hauler store info
-          ls -laR && rm -rf store gitea.tar.zst
+          ls -laR
 
       - name: Test/Lint KubeVip
         run: |
           cd hauler/kubevip
           time hauler store sync --files rancher-airgap-kubevip.yaml
           time hauler store save --filename kubevip.tar.zst
           hauler store info
-          ls -laR && rm -rf store kubevip.tar.zst
+          ls -laR
 
       - name: Test/Lint Vault
         run: |
           cd hauler/vault
           time hauler store sync --files rancher-airgap-vault.yaml
           time hauler store save --filename vault.tar.zst
           hauler store info
-          ls -laR && rm -rf store vault.tar.zst
+          ls -laR
 
   rancher-airgap-release:
     name: Rancher Airgap - Release Job
@@ -342,7 +342,7 @@ jobs:
       - name: Fetch/Build Rancher Minimal
         run: |
           cd hauler/rancher && source ~/.bashrc
-          rm -rf store
+          rm -rf store amd64 arm64
           sed -i 's#quay.io/##g' rancher-airgap-rancher-minimal.yaml
           sed -i 's#https://releases.rancher.com/server-charts/latest#https://rancherfederal.github.io/carbide-charts#g' rancher-airgap-rancher-minimal.yaml
           time hauler store sync --store amd64 --registry ${Registry} --key ../../carbide-key.pub --platform linux/amd64 --files rancher-airgap-rancher-minimal.yaml