From 14d363000fa2416271ea34528eedce581184af32 Mon Sep 17 00:00:00 2001
From: Salah Al Saleh <sg.alsaleh@gmail.com>
Date: Fri, 26 Jan 2024 16:13:10 +0000
Subject: [PATCH] test new bundle format

---
 .github/workflows/build-test.yaml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index da3e23ac4d..a2fdd35111 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -25,32 +25,36 @@ jobs:
         docker run -d -p 5000:5000 --restart=always --name registry -v "$(pwd)/kotsadm-bundle/images":/var/lib/registry registry:2
         docker run -d -p 5001:5000 --restart=always --name registry-nominio -v "$(pwd)/kotsadm-bundle-nominio/images":/var/lib/registry registry:2
 
-    - name: Read image tags from env file
-      run: mapfile -t envs < <(grep -v '#.*' < .image.env) && export "${envs[@]}"
-
     - name: Build kotsadm bundle
       env:
         BUNDLE_DIR: kotsadm-bundle
         BUNDLE_REGISTRY: localhost:5000
         GIT_TAG: ${{ needs.generate-tag.outputs.tag }}
-      run: make kotsadm-bundle
+      run: mapfile -t envs < <(grep -v '#.*' < .image.env) && export "${envs[@]}" && make kotsadm-bundle
 
     - name: Build kotsadm bundle without minio
       env:
         BUNDLE_DIR: kotsadm-bundle-nominio
         BUNDLE_REGISTRY: localhost:5001
         GIT_TAG: ${{ needs.generate-tag.outputs.tag }}
-      run: make kotsadm-bundle-nominio
+      run: mapfile -t envs < <(grep -v '#.*' < .image.env) && export "${envs[@]}" && make kotsadm-bundle-nominio
 
-    - name: ls dirs
+    - name: tar up the bundles
       run: |
-        ls -lah kotsadm-bundle
-        ls -lah kotsadm-bundle/images
-        cat kotsadm-bundle/airgap.yaml
-
-        ls -lah kotsadm-bundle-nominio
-        ls -lah kotsadm-bundle-nominio/images
-        cat kotsadm-bundle-nominio/airgap.yaml
+        tar -czvf kotsadm.tar.gz kotsadm-bundle
+        tar -czvf kotsadm-nominio.tar.gz kotsadm-bundle-nominio
+
+    - name: Upload kotsadm bundle
+      uses: actions/upload-artifact@v4
+      with:
+        name: kotsadm-bundle
+        path: kotsadm.tar.gz
+
+    - name: Upload kotsadm bundle without minio
+      uses: actions/upload-artifact@v4
+      with:
+        name: kotsadm-bundle-nominio
+        path: kotsadm-nominio.tar.gz
 
   # can-run-ci:
   #   runs-on: ubuntu-20.04